games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

Fixed #927.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2012-04-14 07:39:32 +00:00
parent b5526f0f54
commit 6ec3501909
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/CPlayerInterface.cpp
View File

@ -1997,7 +1997,7 @@ void CPlayerInterface::gameOver(ui8 player, bool victory )
// showInfoDialog("Placeholder message: you won!"); // showInfoDialog("Placeholder message: you won!");
makingTurn = true; makingTurn = true;
while(showingDialog->get() || dialogs.size()); //wait till all dialogs are displayed and closed waitForAllDialogs(); //wait till all dialogs are displayed and closed
makingTurn = false; makingTurn = false;
howManyPeople--; howManyPeople--;

16
server/CGameHandler.cpp
View File

@ -4489,7 +4489,7 @@ void CGameHandler::checkLossVictory( ui8 player )
peg.victory = vic; peg.victory = vic;
sendAndApply(&peg); sendAndApply(&peg);
if(vic > 0) //one player won -> all enemies lost if(vic) //one player won -> all enemies lost
{ {
iw.text.localStrings.front().second++; //message about losing because enemy won first is just after victory message iw.text.localStrings.front().second++; //message about losing because enemy won first is just after victory message
@ -4520,28 +4520,28 @@ void CGameHandler::checkLossVictory( ui8 player )
//eliminating one player may cause victory of another: //eliminating one player may cause victory of another:
winLoseHandle(GameConstants::ALL_PLAYERS & ~(1<<player)); winLoseHandle(GameConstants::ALL_PLAYERS & ~(1<<player));
} }
if(vic) if(vic)
{ {
end2 = true; end2 = true;
if(gs->campaign) if(gs->campaign)
{ {
std::vector<CGHeroInstance *> hes; std::vector<CGHeroInstance *> hes;
BOOST_FOREACH(CGHeroInstance * ghi, gs->map->heroes) BOOST_FOREACH(CGHeroInstance * ghi, gs->map->heroes)
{
if (ghi->tempOwner == vic)
{ {
if (ghi->tempOwner == vic)
{
hes.push_back(ghi); hes.push_back(ghi);
}
} }
}
gs->campaign->mapConquered(hes); gs->campaign->mapConquered(hes);
UpdateCampaignState ucs; UpdateCampaignState ucs;
ucs.camp = gs->campaign; ucs.camp = gs->campaign;
sendAndApply(&ucs); sendAndApply(&ucs);
} }
} }
} }