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

Implemented tracking of objects destroyed by players

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-31 01:37:33 +02:00
parent ccea7fc1fb
commit 2e4895766a
13 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/networkPacks/NetPacksLib.cpp
View File

@ -1156,6 +1156,9 @@ void RemoveObject::applyGs(CGameState *gs)
//unblock tiles
gs->map->removeBlockVisTiles(obj);
if (initiator.isValidPlayer())
gs->getPlayerState(initiator)->destroyedObjects.insert(objectID);
if(obj->ID == Obj::HERO) //remove beaten hero
{
auto * beatenHero = dynamic_cast<CGHeroInstance *>(obj);
@ -1221,27 +1224,6 @@ void RemoveObject::applyGs(CGameState *gs)
}
}
for (TriggeredEvent & event : gs->map->triggeredEvents)
{
auto patcher = [&](EventCondition cond) -> EventExpression::Variant
{
if (cond.objectID == obj->id)
{
if (cond.condition == EventCondition::DESTROY)
{
cond.condition = EventCondition::CONST_VALUE;
cond.value = 1; // destroyed object, from now on always fulfilled
}
else if (cond.condition == EventCondition::CONTROL)
{
cond.condition = EventCondition::CONST_VALUE;
cond.value = 0; // destroyed object, from now on can not be fulfilled
}
}
return cond;
};
event.trigger = event.trigger.morph(patcher);
}
gs->map->instanceNames.erase(obj->instanceName);
gs->map->objects[objectID.getNum()].dellNull();
gs->map->calculateGuardingGreaturePositions();