tile fix

jonylu7 · Jun 13, 2024 · 5642485 · 5642485
1 parent 5da849c
commit 5642485
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/include/Map/Tile.hpp b/include/Map/Tile.hpp
@@ -52,9 +52,9 @@ class TileClass {
     void pushAvatars(std::shared_ptr<Avatar> avatar) {
         avatar->getMoving()->setStandingCorner(m_Avatars.size());
         m_Avatars.push_back(avatar);
-        if (m_Avatars.size() == 4) {
-            setWalkable(false);
-        }
+        // if (m_Avatars.size() == 4) {
+        //    setWalkable(false);
+        //}
     }
 
     std::vector<std::shared_ptr<Avatar>> getAvatars() { return m_Avatars; }
@@ -119,7 +119,7 @@ class TileClass {
     }
 
     bool ifEnemyAtTile(HouseType myHouse) {
-        if(myHouse==HouseType::MY){
+        if (myHouse == HouseType::MY) {
             if (m_Structure->getID().getHouse() == HouseType::ENEMY) {
                 return true;
             }
@@ -129,7 +129,7 @@ class TileClass {
                 }
             }
             return false;
-        }else if(myHouse==HouseType::ENEMY){
+        } else if (myHouse == HouseType::ENEMY) {
             if (m_Structure->getID().getHouse() == HouseType::MY) {
                 return true;
             }
@@ -142,7 +142,6 @@ class TileClass {
         }
     }
 
-
 private:
     bool m_TerrainBuildable;
     bool m_TerrainWalkable;

diff --git a/src/Mechanics/AvatarNavigator.cpp b/src/Mechanics/AvatarNavigator.cpp
@@ -74,6 +74,9 @@ AvatarNavigator::moveAlongsideObstacle(Side side, glm::vec2 currentcell,
         path.push_back(currentdir);
         currentcell =
             PathUtility::getNextCellByCurrent(currentdir, currentcell);
+        if (path.size() > 30) {
+            return path;
+        }
     }
 
     return path;