edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

end a round when there's only 1 player left (#961)

Browse source
This commit is contained in:
BeaR 2012-07-12 09:23:05 +02:00 committed by oy
parent a9165cd7a0
commit 96d30fa820
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/server/gamecontroller.cpp
View file

@ -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();