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

Resume game when last non-ready player leaves or spectates

Browse source
This commit is contained in:
Jordy Ruiz 2018-12-07 12:45:33 +01:00
parent 834a433ca8
commit fac3dba7e6
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -352,6 +352,8 @@ void IGameController::OnPlayerDisconnect(CPlayer *pPlayer)
--m_aTeamSize[pPlayer->GetTeam()]; --m_aTeamSize[pPlayer->GetTeam()];
m_UnbalancedTick = TBALANCE_CHECK; m_UnbalancedTick = TBALANCE_CHECK;
} }
CheckReadyStates();
} }
void IGameController::OnPlayerInfoChange(CPlayer *pPlayer) void IGameController::OnPlayerInfoChange(CPlayer *pPlayer)
@ -365,14 +367,20 @@ void IGameController::OnPlayerReadyChange(CPlayer *pPlayer)
// change players ready state // change players ready state
pPlayer->m_IsReadyToPlay ^= 1; pPlayer->m_IsReadyToPlay ^= 1;
// check if it effects current game state if(m_GameState == IGS_GAME_RUNNING && !pPlayer->m_IsReadyToPlay)
SetGameState(IGS_GAME_PAUSED, TIMER_INFINITE); // one player isn't ready -> pause the game
CheckReadyStates();
}
}
// to be called when a player changes state, spectates or disconnects
void IGameController::CheckReadyStates()
{
if(g_Config.m_SvPlayerReadyMode)
{
switch(m_GameState) switch(m_GameState)
{ {
case IGS_GAME_RUNNING:
// one player isn't ready -> pause the game
if(!pPlayer->m_IsReadyToPlay)
SetGameState(IGS_GAME_PAUSED, TIMER_INFINITE);
break;
case IGS_WARMUP_USER: case IGS_WARMUP_USER:
// all players are ready -> end warmup // all players are ready -> end warmup
if(GetPlayersReadyState()) if(GetPlayersReadyState())
@ -383,11 +391,12 @@ void IGameController::OnPlayerReadyChange(CPlayer *pPlayer)
if(GetPlayersReadyState()) if(GetPlayersReadyState())
SetGameState(IGS_GAME_PAUSED, 0); SetGameState(IGS_GAME_PAUSED, 0);
break; break;
case IGS_GAME_RUNNING:
case IGS_WARMUP_GAME: case IGS_WARMUP_GAME:
case IGS_START_COUNTDOWN: case IGS_START_COUNTDOWN:
case IGS_END_MATCH: case IGS_END_MATCH:
case IGS_END_ROUND: case IGS_END_ROUND:
// not effected // not affected
break; break;
} }
} }
@ -1129,6 +1138,7 @@ void IGameController::DoTeamChange(CPlayer *pPlayer, int Team, bool DoChatMsg)
} }
OnPlayerInfoChange(pPlayer); OnPlayerInfoChange(pPlayer);
GameServer()->OnClientTeamChange(ClientID); GameServer()->OnClientTeamChange(ClientID);
CheckReadyStates();
// reset inactivity counter when joining the game // reset inactivity counter when joining the game
if(OldTeam == TEAM_SPECTATORS) if(OldTeam == TEAM_SPECTATORS)

1
src/game/server/gamecontroller.h
View file

@ -21,6 +21,7 @@ class IGameController
void DoActivityCheck(); void DoActivityCheck();
bool GetPlayersReadyState(); bool GetPlayersReadyState();
void SetPlayersReadyState(bool ReadyState); void SetPlayersReadyState(bool ReadyState);
void CheckReadyStates();
// balancing // balancing
enum enum