3 files changed, 61 insertions, 0 deletions

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 854787d6..03372ad1 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -443,7 +443,9 @@ void IGameController::Tick()
 				}
 				
 				// move the player to the other team
+				int Temp = pP->m_LastActionTick;
 				pP->SetTeam(M^1);
+				pP->m_LastActionTick = Temp;
 				
 				pP->Respawn();
 				pP->m_ForceBalanced = true;
@@ -453,6 +455,47 @@ void IGameController::Tick()
 		}
 		m_UnbalancedTick = -1;
 	}
+
+	// check for inactive players
+	if(g_Config.m_SvInactiveKickTime > 0)
+	{
+		for(int i = 0; i < MAX_CLIENTS; ++i)
+		{
+			if(GameServer()->m_apPlayers[i] && GameServer()->m_apPlayers[i]->GetTeam() != -1)
+			{
+				if(Server()->Tick() > GameServer()->m_apPlayers[i]->m_LastActionTick+g_Config.m_SvInactiveKickTime*Server()->TickSpeed()*60)
+				{
+					switch(g_Config.m_SvInactiveKick)
+					{
+					case 0:
+						{
+							// move player to spectator
+							GameServer()->m_apPlayers[i]->SetTeam(-1);
+						}
+						break;
+					case 1:
+						{
+							// move player to spectator if the reserved slots aren't filled yet, kick him otherwise
+							int Spectators = 0;
+							for(int j = 0; j < MAX_CLIENTS; ++j)
+								if(GameServer()->m_apPlayers[j] && GameServer()->m_apPlayers[j]->GetTeam() == -1)
+									++Spectators;
+							if(Spectators >= g_Config.m_SvSpectatorSlots)
+								Server()->Kick(i, "kicked for inactivity");
+							else
+								GameServer()->m_apPlayers[i]->SetTeam(-1);
+						}
+						break;
+					case 2:
+						{
+							// kick the player
+							Server()->Kick(i, "Kicked for inactivity");
+						}
+					}
+				}
+			}
+		}
+	}
 	
 	// update browse info
 	int Prog = -1;
diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index 8b3c623a..6408707d 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -15,6 +15,7 @@ CPlayer::CPlayer(CGameContext *pGameServer, int CID, int Team)
 	Character = 0;
 	this->m_ClientID = CID;
 	m_Team = GameServer()->m_pController->ClampTeam(Team);
+	m_LastActionTick = Server()->Tick();
 }
 
 CPlayer::~CPlayer()
@@ -126,6 +127,16 @@ void CPlayer::OnDirectInput(CNetObj_PlayerInput *NewInput)
 	
 	if(!Character && m_Team == -1)
 		m_ViewPos = vec2(NewInput->m_TargetX, NewInput->m_TargetY);
+
+	// check for activity
+	if(NewInput->m_Direction || m_LatestActivity.m_TargetX != NewInput->m_TargetX ||
+		m_LatestActivity.m_TargetY != NewInput->m_TargetY || NewInput->m_Jump ||
+		NewInput->m_Fire&1 || NewInput->m_Hook)
+	{
+		m_LatestActivity.m_TargetX = NewInput->m_TargetX;
+		m_LatestActivity.m_TargetY = NewInput->m_TargetY;
+		m_LastActionTick = Server()->Tick();
+	}
 }
 
 CCharacter *CPlayer::GetCharacter()
@@ -165,6 +176,7 @@ void CPlayer::SetTeam(int Team)
 	KillCharacter();
 
 	m_Team = Team;
+	m_LastActionTick = Server()->Tick();
 	// we got to wait 0.5 secs before respawning
 	m_RespawnTick = Server()->Tick()+Server()->TickSpeed()/2;
 	str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' m_Team=%d", m_ClientID, Server()->ClientName(m_ClientID), m_Team);
diff --git a/src/game/server/player.h b/src/game/server/player.h
index ca7ab072..7aab0b6e 100644
--- a/src/game/server/player.h
+++ b/src/game/server/player.h
@@ -62,6 +62,12 @@ public:
 	int m_Score;
 	int m_ScoreStartTick;
 	bool m_ForceBalanced;
+	int m_LastActionTick;
+	struct
+	{
+		int m_TargetX;
+		int m_TargetY;
+	} m_LatestActivity;
 	
 private:
 	CCharacter *Character;