games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Change deleted objects format to use ObjectInstanceID

Browse Source
This commit is contained in:
Dydzio
2024-09-28 22:58:05 +02:00
parent 0589403ea3
commit 3bff68958e
6 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/processors/NewTurnProcessor.cpp
View File

@ -64,20 +64,14 @@ void NewTurnProcessor::handleTimeEvents(PlayerColor color)
}
//remove objects specified by event
for(const CGObjectInstance * objectToRemove : event.deletedObjectsInstances)
for(const ObjectInstanceID objectIdToRemove : event.deletedObjectsInstances)
{
removedObjects.push_back(objectToRemove);
gameHandler->removeObject(objectToRemove, PlayerColor::NEUTRAL);
auto objectInstance = gameHandler->getObj(objectIdToRemove, false);
if(objectInstance != nullptr)
gameHandler->removeObject(objectInstance, PlayerColor::NEUTRAL);
}
gameHandler->sendAndApply(&iw); //show dialog
}
for (auto & event : gameHandler->gameState()->map->events)
vstd::erase_if(event.deletedObjectsInstances,
[removedObjects](const CGObjectInstance * o)
{
return vstd::contains(removedObjects, o);
});
}
void NewTurnProcessor::handleTownEvents(const CGTownInstance * town)