games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Simplified code

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-13 23:49:00 +02:00
parent 45c971a405
commit 6d6137accc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gameState/CGameState.cpp
View File

@@ -1383,10 +1383,8 @@ bool CGameState::checkForVictory(const PlayerColor & player, const EventConditio
int total = 0; //creature counter int total = 0; //creature counter
for(auto object : map->objects) for(auto object : map->objects)
{ {
const CArmedInstance *ai = nullptr; const CArmedInstance *ai = dynamic_cast<const CArmedInstance *>(object.get());
if(object if(ai && ai->getOwner() == player)
&& object->tempOwner == player //object controlled by player
&& (ai = dynamic_cast<const CArmedInstance *>(object.get()))) //contains army
{ {
for(const auto & elem : ai->Slots()) //iterate through army for(const auto & elem : ai->Slots()) //iterate through army
if(elem.second->getId() == condition.objectType.as<CreatureID>()) //it's searched creature if(elem.second->getId() == condition.objectType.as<CreatureID>()) //it's searched creature