games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix: getting additional damage from destination obstacles

Browse Source 
When the stack was selected to pass through 2 field in moat, first hex
stopped him but then he got also additional damage from destination
obstacle.
This commit is contained in:
FeniksFire
2017-07-08 17:16:54 +02:00
parent 3634af10ba
commit 45a63e003c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/CGameHandler.cpp
View File

@@ -1368,10 +1368,11 @@ int CGameHandler::moveStack(int stack, BattleHex dest)
{
for(auto & i : obs)
{
handleDamageFromObstacle(*i, curStack);
//if stack die in explosion or interrupted by obstacle, abort movement
if(i->stopsMovement() || !curStack->alive())
stackIsMoving = false;
else if(stackIsMoving)
handleDamageFromObstacle(*i, curStack);
i.reset();
}
}