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

Patch from Ubuntux:

Browse Source 
* Revert a change from rev 826 that breaks compilation under gcc.

( vcmi_fix_linux_no_compile.diff )
This commit is contained in:
Michał W. Urbańczyk 2009-05-03 23:43:07 +00:00
parent 2900e75818
commit 6aacc95945
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@ -469,7 +469,11 @@ void CGameHandler::prepareAttack(BattleAttack &bat, CStack *att, CStack *def)
bat.bsa.clear();
bat.stackAttacking = att->ID;
std::set<BattleStackAttacked>::iterator i = bat.bsa.insert(BattleStackAttacked()).first;
BattleStackAttacked *bsa = &*i;
#ifdef __GNUC__
BattleStackAttacked *bsa = (BattleStackAttacked *)&*i;
#else
BattleStackAttacked *bsa = &*i;
#endif
bsa->stackAttacked = def->ID;
bsa->damageAmount = BattleInfo::calculateDmg(att, def, gs->getHero(att->attackerOwned ? gs->curB->hero1 : gs->curB->hero2), gs->getHero(def->attackerOwned ? gs->curB->hero1 : gs->curB->hero2), bat.shot());//counting dealt damage