Biggest update in a decade, removed homework from assets

Matqyou · Dec 5, 2024 · add21c8 · add21c8
1 parent feb8ea5
commit add21c8
Show file tree

Hide file tree

Showing 13 changed files with 506 additions and 681 deletions.
diff --git a/bin/assets/images/interface/PermanentErrors/3_P_D.docx b/bin/assets/images/interface/PermanentErrors/3_P_D.docx
diff --git a/bin/assets/images/interface/PermanentErrors/EXP_FJA_MAt T II (1).pdf b/bin/assets/images/interface/PermanentErrors/EXP_FJA_MAt T II (1).pdf
diff --git a/bin/assets/sounds/entities/character/InvincibleHit.wav b/bin/assets/sounds/entities/character/InvincibleHit.wav
diff --git a/src/client/Decals.cpp b/src/client/Decals.cpp
@@ -87,8 +87,10 @@ Decals::Decals(SDL_Renderer* renderer): m_InvalidTexture(nullptr)
 
         // Load the texture
         SDL_Surface* TempSurface = IMG_Load(file_path.string().c_str());
-        if (!TempSurface)
-            throw std::runtime_error(FString("Failed to load texture '%s'\n", file_path.string().c_str()));
+        if (!TempSurface) {
+            std::cout << FString("Failed to load texture '%s'", file_path.string().c_str()) << std::endl;
+            continue;
+        }
 
         SDL_Texture* NewSDLTexture = SDL_CreateTextureFromSurface(renderer, TempSurface);
         SDL_FreeSurface(TempSurface);

diff --git a/src/game/GameWorld.cpp b/src/game/GameWorld.cpp
@@ -425,7 +425,9 @@ void GameWorld::TickDestroy()
 
 void GameWorld::Tick()
 {
-    // todo: remove m_paused for real
+    if (m_Paused || m_GameOver)
+        return;
+
     if (!m_ShowNames)
         m_ShowNamesVisibility *= 0.98;
 

diff --git a/src/game/GameWorld.h b/src/game/GameWorld.h
@@ -62,6 +62,7 @@ class GameWorld {
     [[nodiscard]] Player *FirstPlayer() const { return m_FirstPlayer; }
     [[nodiscard]] Character* FirstCharacter() const { return (Character*)(FirstEntityType(CHARACTER_ENTITY)); }
     [[nodiscard]] Crate* FirstCrate() const { return (Crate*)(FirstEntityType(CRATE_ENTITY)); }
+    [[nodiscard]] bool GetDelay() const { return  m_LevelUpDelay; }
     // void GetPointInWorld(double relative_x, double relative_y, double& out_x, double& out_y) const;
 
     // Setting

diff --git a/src/game/entities/Entity.cpp b/src/game/entities/Entity.cpp
@@ -85,8 +85,10 @@ Entity::Entity(GameWorld* world,
       m_pLastUnknownCore(form_factor == DIRECTIONAL_ENTITY ? new DirectionalEntityCore() : new EntityCore()),
       m_Core(*m_pUnknownCore),
       m_LastCore(*m_pLastUnknownCore),
-      m_HasHealthComponent(has_health_component), m_HealthComponent(*this, max_health) {
+      m_HasHealthComponent(has_health_component),
+      m_HealthComponent(*this, max_health) {
     m_World = world;
+
     m_PrevType = nullptr;
     m_NextType = nullptr;
     m_Prev = nullptr;

diff --git a/src/game/entities/Projectile.cpp b/src/game/entities/Projectile.cpp
@@ -67,11 +67,11 @@ void Projectile::TickCollision() {
         if (!Entity->HasHealthComponent()) continue;
 
         // Ignore npc friendly fire for now
-//        if (HasHealthComponent->GetType() == CHARACTER) {
-//            auto ShootableCharacter = (Character*)HasHealthComponent;
-//            if (ShooterIsCharacter && ShooterCharacter->IsNPC() == ShootableCharacter->IsNPC())
-//                continue;
-//        }
+        if (Entity->GetType() == CHARACTER_ENTITY) {
+            auto ShootableCharacter = (Character*)Entity;
+            if (ShooterIsCharacter && ShooterCharacter->IsNPC() == ShootableCharacter->IsNPC())
+                continue;
+        }
 
         // Check for (Projectile <-> Entity) collision at the position
         bool Collides = Entity->PointCollides(m_Core.Pos);