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

Compile fix for Kingdom Overview

Browse Source 
Fixed common crash with gained exp, fixed necromancy.
This commit is contained in:
DjWarmonger
2011-07-23 06:14:05 +00:00
parent 5d2f5c2e33
commit 2047862eb1
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/CGameHandler.cpp
View File

@@ -414,6 +414,27 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
sendAndApply(&iw);
sendAndApply(&cs);
}
// Necromancy if applicable.
const CGHeroInstance *winnerHero = battleResult.data->winner != 0 ? hero2 : hero1;
const CGHeroInstance *loserHero = battleResult.data->winner != 0 ? hero1 : hero2;
if (winnerHero)
{
CStackBasicDescriptor raisedStack = winnerHero->calculateNecromancy(*battleResult.data);
// Give raised units to winner and show dialog, if any were raised.
if (raisedStack.type)
{
TSlot slot = winnerHero->getSlotFor(raisedStack.type);
if (slot != -1)
{
winnerHero->showNecromancyDialog(raisedStack);
addToSlot(StackLocation(winnerHero, slot), raisedStack.type, raisedStack.count);
}
}
}
if(!duel)
{
@@ -449,27 +470,6 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
return;
}
// Necromancy if applicable.
const CGHeroInstance *winnerHero = battleResult.data->winner != 0 ? hero2 : hero1;
const CGHeroInstance *loserHero = battleResult.data->winner != 0 ? hero1 : hero2;
if (winnerHero)
{
CStackBasicDescriptor raisedStack = winnerHero->calculateNecromancy(*battleResult.data);
// Give raised units to winner and show dialog, if any were raised.
if (raisedStack.type)
{
TSlot slot = winnerHero->getSlotFor(raisedStack.type);
if (slot != -1)
{
winnerHero->showNecromancyDialog(raisedStack);
addToSlot(StackLocation(winnerHero, slot), raisedStack.type, raisedStack.count);
}
}
}
if(visitObjectAfterVictory && winnerHero == hero1)
{
visitObjectOnTile(*getTile(winnerHero->getPosition()), winnerHero);
@@ -506,8 +506,8 @@ void CGameHandler::afterBattleCallback() //object interaction after leveling up
(*battleEndCallback)(battleResult.data);
delete battleEndCallback;
battleEndCallback = 0;
delete battleResult.data; //remove only after battle
}
delete battleResult.data;
}
void CGameHandler::prepareAttack(BattleAttack &bat, const CStack *att, const CStack *def, int distance, int targetHex)
{