games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed possible crash at the game start (when victory conditions are checked before currentPlayer is set).

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2014-02-01 16:08:01 +00:00
parent 14535c1c7b
commit e5312887d1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@@ -5193,9 +5193,11 @@ void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player)
checkVictoryLossConditions(playerColors);
}
//If player making turn has lost his turn must be over as well
if(gs->getPlayer(gs->currentPlayer)->status != EPlayerStatus::INGAME)
auto playerInfo = gs->getPlayer(gs->currentPlayer, false);
// If we are called before the actual game start, there might be no current player
if(playerInfo && playerInfo->status != EPlayerStatus::INGAME)
{
// If player making turn has lost his turn must be over as well
states.setFlag(gs->currentPlayer, &PlayerStatus::makingTurn, false);
}
}