Code review

ihhub · Jan 5, 2025 · 203d29e · 203d29e
1 parent 09756de
commit 203d29e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/fheroes2/kingdom/race.cpp b/src/fheroes2/kingdom/race.cpp
@@ -126,6 +126,25 @@ bool Race::isMagicalRace( const int race )
     return false;
 }
 
+bool Race::isEvilRace( const int race )
+{
+    switch ( race ) {
+    case BARB:
+    case WRLK:
+    case NECR:
+        return true;
+    case KNGT:
+    case SORC:
+    case WZRD:
+        return false;
+    default:
+        assert( 0 );
+        break;
+    }
+
+    return false;
+}
+
 uint8_t Race::IndexToRace( const int index )
 {
     switch ( index ) {

diff --git a/src/fheroes2/kingdom/race.h b/src/fheroes2/kingdom/race.h
@@ -53,4 +53,5 @@ namespace Race
     int getPreviousRace( const int race );
 
     bool isMagicalRace( const int race );
+    bool isEvilRace( const int race );
 }
diff --git a/src/fheroes2/system/settings.cpp b/src/fheroes2/system/settings.cpp
@@ -920,15 +920,13 @@ bool Settings::isEvilInterfaceEnabled() const
             return false;
 
         if ( player->isControlHuman() ) {
-            const int race = player->GetRace();
-            return race == Race::WRLK || race == Race::NECR || race == Race::BARB;
+            return Race::isEvilRace( player->GetRace() );
         }
 
         // Keep the UI of the last player during the AI turn
         for ( auto iter = Settings::Get().GetPlayers().rbegin(); iter < Settings::Get().GetPlayers().rend(); ++iter ) {
             if ( *iter && ( *iter )->isControlHuman() ) {
-                const int race = ( *iter )->GetRace();
-                return race == Race::WRLK || race == Race::NECR || race == Race::BARB;
+                return Race::isEvilRace( ( *iter )->GetRace() );
             }
         }
         break;