games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

* removed unnecessary include in .h -- they should be avoided

Browse Source 
* fixed bug 1074
* fixed starting new custom campaign
* fixed building of ERM project
This commit is contained in:
mateuszb
2012-09-18 15:06:29 +00:00
parent 20b54a39b6
commit aa04a5bcd0
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/CGameHandler.cpp
View File

@@ -3356,8 +3356,8 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
break;
}
BattleHex startingPos = stack->position;
int distance = moveStack(ba.stackNumber, ba.destinationTile);
int startingPos = stack->position;
tlog5 << stack->nodeName() << " will attack " << stackAtEnd->nodeName() << std::endl;
@@ -3418,7 +3418,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
}
//second attack
if(stack //FIXME: clones tend to dissapear during actions
if(stack //FIXME: clones tend to disapear during actions
&& stack->valOfBonuses(Bonus::ADDITIONAL_ATTACK) > 0
&& !stack->hasBonusOfType(Bonus::SHOOTER)
&& stack->alive()