From 96d30fa820e8826b3ac740aab570fa1f68c045a1 Mon Sep 17 00:00:00 2001 From: BeaR Date: Thu, 12 Jul 2012 09:23:05 +0200 Subject: [PATCH] end a round when there's only 1 player left (#961) --- src/game/server/gamecontroller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index f83546794..44095a3bd 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -566,7 +566,7 @@ void IGameController::SetGameState(EGameState GameState, int Timer) case IGS_END_ROUND: case IGS_END_MATCH: // only possible when game is running or over - if(m_GameState == IGS_GAME_RUNNING || m_GameState == IGS_END_MATCH || m_GameState == IGS_END_ROUND) + if(m_GameState == IGS_GAME_RUNNING || m_GameState == IGS_END_MATCH || m_GameState == IGS_END_ROUND || m_GameState == IGS_GAME_PAUSED) { m_GameState = GameState; m_GameStateTimer = Timer*Server()->TickSpeed(); @@ -747,7 +747,7 @@ void IGameController::Tick() DoActivityCheck(); // win check - if(m_GameState == IGS_GAME_RUNNING && !GameServer()->m_World.m_ResetRequested) + if((m_GameState == IGS_GAME_RUNNING || m_GameState == IGS_GAME_PAUSED) && !GameServer()->m_World.m_ResetRequested) { if(m_GameFlags&GAMEFLAG_SURVIVAL) DoWincheckRound();