1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

NetPacksLib: remove obstacle ACTIVATE* actions

Actually these actions was not working anyway.
This commit is contained in:
Konstantin 2023-03-19 03:45:25 +03:00
parent a0de223901
commit 5b50191af7
3 changed files with 2 additions and 5 deletions

View File

@ -308,8 +308,6 @@ public:
RESET_STATE,
UPDATE,
REMOVE,
ACTIVATE_AND_UPDATE,
ACTIVATE_AND_REMOVE
};
JsonNode data;

View File

@ -2398,7 +2398,6 @@ void BattleObstaclesChanged::applyBattle(IBattleState * battleState)
case BattleChanges::EOperation::ADD:
battleState->addObstacle(change);
break;
case BattleChanges::EOperation::ACTIVATE_AND_UPDATE:
case BattleChanges::EOperation::UPDATE:
battleState->updateObstacle(change);
break;

View File

@ -5323,9 +5323,9 @@ bool CGameHandler::handleDamageFromObstacle(const CStack * curStack, bool stackI
ObstacleChanges changeInfo;
changeInfo.id = spellObstacle->uniqueID;
if (oneTimeObstacle)
changeInfo.operation = ObstacleChanges::EOperation::ACTIVATE_AND_REMOVE;
changeInfo.operation = ObstacleChanges::EOperation::REMOVE;
else
changeInfo.operation = ObstacleChanges::EOperation::ACTIVATE_AND_UPDATE;
changeInfo.operation = ObstacleChanges::EOperation::UPDATE;
SpellCreatedObstacle changedObstacle;
changedObstacle.uniqueID = spellObstacle->uniqueID;