Fix a few recently introduced code smells (#7430)

ihhub · Jul 20, 2023 · dd6a80c · dd6a80c
1 parent e5c4954
commit dd6a80c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/fheroes2/ai/normal/ai_normal_hero.cpp b/src/fheroes2/ai/normal/ai_normal_hero.cpp
@@ -2092,7 +2092,7 @@ namespace AI
             class AIWorldPathfinderStateRestorer
             {
             public:
-                AIWorldPathfinderStateRestorer( AIWorldPathfinder & pathfinder )
+                explicit AIWorldPathfinderStateRestorer( AIWorldPathfinder & pathfinder )
                     : _pathfinder( pathfinder )
                     , _originalMinimalArmyStrengthAdvantage( _pathfinder.getMinimalArmyStrengthAdvantage() )
                     , _originalSpellPointsReserveRatio( _pathfinder.getSpellPointsReserveRatio() )

diff --git a/src/fheroes2/ai/normal/ai_normal_kingdom.cpp b/src/fheroes2/ai/normal/ai_normal_kingdom.cpp
@@ -714,14 +714,8 @@ namespace AI
 
     void Normal::removeEnemyArmies( const int32_t tileIndex )
     {
-        for ( auto iter = _enemyArmies.begin(); iter != _enemyArmies.end(); ) {
-            if ( iter->index == tileIndex ) {
-                iter = _enemyArmies.erase( iter );
-            }
-            else {
-                ++iter;
-            }
-        }
+        _enemyArmies.erase( std::remove_if( _enemyArmies.begin(), _enemyArmies.end(), [tileIndex]( const EnemyArmy & item ) { return item.index == tileIndex; } ),
+                            _enemyArmies.end() );
     }
 
     void Normal::KingdomTurn( Kingdom & kingdom )