Speed up object erasure in the Editor

No need to update map information for each town and hero. relates to #6845
ihhub · May 18, 2024 · b5ef755 · b5ef755
1 parent d097964
commit b5ef755
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/fheroes2/editor/editor_interface.cpp b/src/fheroes2/editor/editor_interface.cpp
@@ -198,15 +198,12 @@ namespace
         }
 
         bool needRedraw = false;
+        bool updateMapPlayerInformation = false;
 
         // Filter objects by group and remove them from '_mapFormat'.
         for ( size_t mapTileIndex = 0; mapTileIndex < mapFormat.tiles.size(); ++mapTileIndex ) {
             Maps::Map_Format::TileInfo & mapTile = mapFormat.tiles[mapTileIndex];
 
-            if ( mapTile.objects.empty() ) {
-                continue;
-            }
-
             for ( auto objectIter = mapTile.objects.begin(); objectIter != mapTile.objects.end(); ) {
                 // LANDSCAPE_FLAGS and LANDSCAPE_TOWN_BASEMENTS are special objects that should be erased only when erasing the main object.
                 if ( objectIter->group == Maps::ObjectGroup::LANDSCAPE_FLAGS || objectIter->group == Maps::ObjectGroup::LANDSCAPE_TOWN_BASEMENTS
@@ -281,10 +278,7 @@ namespace
                     }
 
                     needRedraw = true;
-
-                    if ( !Maps::updateMapPlayers( mapFormat ) ) {
-                        assert( 0 );
-                    }
+                    updateMapPlayerInformation = true;
                 }
                 else if ( objectIter->group == Maps::ObjectGroup::ROADS ) {
                     assert( mapTileIndex < world.getSize() );
@@ -308,9 +302,7 @@ namespace
                     objectIter = mapTile.objects.erase( objectIter );
                     needRedraw = true;
 
-                    if ( !Maps::updateMapPlayers( mapFormat ) ) {
-                        assert( 0 );
-                    }
+                    updateMapPlayerInformation = true;
                 }
                 else if ( objectIter->group == Maps::ObjectGroup::MONSTERS ) {
                     assert( mapFormat.standardMetadata.find( objectIter->id ) != mapFormat.standardMetadata.end() );
@@ -375,6 +367,12 @@ namespace
             }
         }
 
+        if ( updateMapPlayerInformation ) {
+            if ( !Maps::updateMapPlayers( mapFormat ) ) {
+                assert( 0 );
+            }
+        }
+
         return needRedraw;
     }