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

Remove deleted objects from timed events data

Browse Source
This commit is contained in:
Dydzio
2024-09-28 21:24:13 +02:00
committed by GitHub
parent 6a7f58c3d1
commit 0589403ea3
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/processors/NewTurnProcessor.cpp
View File

@ -40,6 +40,8 @@ NewTurnProcessor::NewTurnProcessor(CGameHandler * gameHandler)
void NewTurnProcessor::handleTimeEvents(PlayerColor color) void NewTurnProcessor::handleTimeEvents(PlayerColor color)
{ {
std::vector<const CGObjectInstance*> removedObjects;
for (auto const & event : gameHandler->gameState()->map->events) for (auto const & event : gameHandler->gameState()->map->events)
{ {
if (!event.occursToday(gameHandler->gameState()->day)) if (!event.occursToday(gameHandler->gameState()->day))
@ -64,10 +66,18 @@ void NewTurnProcessor::handleTimeEvents(PlayerColor color)
//remove objects specified by event //remove objects specified by event
for(const CGObjectInstance * objectToRemove : event.deletedObjectsInstances) for(const CGObjectInstance * objectToRemove : event.deletedObjectsInstances)
{ {
removedObjects.push_back(objectToRemove);
gameHandler->removeObject(objectToRemove, PlayerColor::NEUTRAL); gameHandler->removeObject(objectToRemove, PlayerColor::NEUTRAL);
} }
gameHandler->sendAndApply(&iw); //show dialog 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) void NewTurnProcessor::handleTownEvents(const CGTownInstance * town)