games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Attempt to fix crash

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-20 16:48:05 +02:00
parent 24d25730ad
commit dffa174605
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/TurnTimerHandler.cpp
View File

@ -88,22 +88,22 @@ void TurnTimerHandler::onPlayerGetTurn(PlayerColor player)
void TurnTimerHandler::update(int waitTime) void TurnTimerHandler::update(int waitTime)
{ {
std::lock_guard<std::recursive_mutex> guard(mx); std::lock_guard<std::recursive_mutex> guard(mx);
if(const auto * gs = gameHandler.gameState()) if(!gameHandler.getStartInfo()->turnTimerInfo.isEnabled())
{ return;
for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player) for(PlayerColor player(0); player < PlayerColor::PLAYER_LIMIT; ++player)
if(gs->isPlayerMakingTurn(player)) if(gameHandler.gameState()->isPlayerMakingTurn(player))
onPlayerMakingTurn(player, waitTime); onPlayerMakingTurn(player, waitTime);
// create copy for iterations - battle might end during onBattleLoop call // create copy for iterations - battle might end during onBattleLoop call
std::vector<BattleID> ongoingBattles; std::vector<BattleID> ongoingBattles;
for (auto & battle : gs->currentBattles) for (auto & battle : gameHandler.gameState()->currentBattles)
ongoingBattles.push_back(battle->battleID); ongoingBattles.push_back(battle->battleID);
for (auto & battleID : ongoingBattles) for (auto & battleID : ongoingBattles)
onBattleLoop(battleID, waitTime); onBattleLoop(battleID, waitTime);
} }
}
bool TurnTimerHandler::timerCountDown(int & timer, int initialTimer, PlayerColor player, int waitTime) bool TurnTimerHandler::timerCountDown(int & timer, int initialTimer, PlayerColor player, int waitTime)
{ {