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

Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4

Browse Source
This commit is contained in:
AlexVinS
2014-11-24 12:41:17 +03:00
parent 6dbed27b65 49c8137f6f
commit f7ff61ce4f
20 changed files with 97 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/CGameHandler.cpp
View File

@ -3390,7 +3390,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
break;
}
if(destinationStack && stack->ID == destinationStack->ID) //we should just move, it will be handled by following check
if(destinationStack && stack && stack->ID == destinationStack->ID) //we should just move, it will be handled by following check
{
destinationStack = nullptr;
}