games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

NetPacksLib: remove obstacle ACTIVATE* actions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/NetPacksBase.h
View File

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

1
lib/NetPacksLib.cpp
View File

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

4
server/CGameHandler.cpp
View File

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