1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00

Various fixes and refactorings. Restored client project to solution.

This commit is contained in:
Michał W. Urbańczyk
2011-09-29 21:29:54 +00:00
parent 1282ad4573
commit 2b18e0b821
21 changed files with 235 additions and 152 deletions

View File

@ -456,7 +456,6 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
winnerHero->showNecromancyDialog(raisedStack);
addToSlot(StackLocation(winnerHero, necroSlot), raisedStack.type, raisedStack.count);
}
sendAndApply(&resultsApplied);
if(duel)
{
@ -471,10 +470,14 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
tlog0 << boost::format("\t* %d of %s\n") % i->second % c->namePl;
casualtiesPoints = c->AIValue * i->second;
}
tlog0 << boost::format("Total causalties points: %d\n") % casualtiesPoints;
return;
tlog0 << boost::format("Total casualties points: %d\n") % casualtiesPoints;
}
sendAndApply(&resultsApplied);
if(duel)
return;
if(visitObjectAfterVictory && winnerHero == hero1)
{
visitObjectOnTile(*getTile(winnerHero->getPosition()), winnerHero);