games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

* fixed #72, #242, #252 (all crashes seem to be caused by harpy dying in retaliation and causing end of battle)

Browse Source
This commit is contained in:
mateuszb 2010-01-29 18:17:07 +00:00
parent 2fdc53594b
commit 8447e58c39
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/CGameHandler.cpp
View File

@ -2676,9 +2676,10 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
}
//return
if(curStack->hasFeatureOfType(StackFeature::RETURN_AFTER_STRIKE) && startingPos != curStack->position)
if(curStack->hasFeatureOfType(StackFeature::RETURN_AFTER_STRIKE) && startingPos != curStack->position && curStack->alive())
{
moveStack(ba.stackNumber, startingPos);
//NOTE: curStack->ID == ba.stackNumber (rev 1431)
}
sendAndApply(&EndAction());
break;