Remove updateEmpty() method. Use its code in the only place where i…

…t is used
ihhub · Jul 13, 2024 · ba65a24 · ba65a24
1 parent ab6c643
commit ba65a24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/fheroes2/maps/maps_tiles.cpp b/src/fheroes2/maps/maps_tiles.cpp
@@ -1454,13 +1454,6 @@ void Maps::Tiles::updateTileObjectIcnIndex( Maps::Tiles & tile, const uint32_t u
     tile._updateRoadFlag();
 }
 
-void Maps::Tiles::updateEmpty()
-{
-    if ( _mainObjectType == MP2::OBJ_NONE ) {
-        updateObjectType();
-    }
-}
-
 void Maps::Tiles::updateObjectType()
 {
     // After removing an action object there could be some other object part in the main addon.

diff --git a/src/fheroes2/maps/maps_tiles.h b/src/fheroes2/maps/maps_tiles.h
@@ -340,9 +340,6 @@ namespace Maps
         Heroes * getHero() const;
         void setHero( Heroes * hero );
 
-        // If tile is empty (MP2::OBJ_NONE) then update tile's object type if needed.
-        void updateEmpty();
-
         // Set tile's object type according to the object's sprite if there is any, otherwise
         // it is set to coast (MP2::OBJ_COAST) if it's near water or to empty (MP2::OBJ_NONE).
         void updateObjectType();

diff --git a/src/fheroes2/world/world.cpp b/src/fheroes2/world/world.cpp
@@ -1293,7 +1293,11 @@ void World::resetPathfinder()
 void World::updatePassabilities()
 {
     for ( Maps::Tiles & tile : vec_tiles ) {
-        tile.updateEmpty();
+        // If tile is empty then update tile's object type if needed.
+        if ( tile.isSameMainObject( MP2::OBJ_NONE ) ) {
+            tile.updateObjectType();
+        }
+
         tile.setInitialPassability();
     }