GameController: Extract infclass-specifc Inactive kick stuff

Author: Kaffeine

src/game/server/gamecontroller.cpp

@@ -127,9 +127,6 @@ void IGameController::DoActivityCheck()
 	if(g_Config.m_SvInactiveKickTime == 0)
 		return;
 
-	int HumanMaxInactiveTimeSecs = Config()->m_InfInactiveHumansKickTime ? Config()->m_InfInactiveHumansKickTime : Config()->m_SvInactiveKickTime * 60;
-	int InfectedMaxInactiveTimeSecs = Config()->m_InfInactiveInfectedKickTime ? Config()->m_InfInactiveInfectedKickTime : Config()->m_SvInactiveKickTime * 60;
-
 	unsigned int nbPlayers = 0;
 
 	for(int i = 0; i < MAX_CLIENTS; ++i)
@@ -166,7 +163,7 @@ void IGameController::DoActivityCheck()
 		if(pPlayer->IsBot())
 			continue;
 
-		float PlayerMaxInactiveTimeSecs = pPlayer->IsHuman() ? HumanMaxInactiveTimeSecs : InfectedMaxInactiveTimeSecs;
+		float PlayerMaxInactiveTimeSecs = GetMaxInactiveTimeSeconds(pPlayer);
 		if(PlayerMaxInactiveTimeSecs < 20)
 		{
 			PlayerMaxInactiveTimeSecs = 20;
@@ -353,6 +350,11 @@ int IGameController::GetNextClientUniqueId()
 	return m_NextUniqueClientId++;
 }
 
+float IGameController::GetMaxInactiveTimeSeconds(const CPlayer *pPlayer) const
+{
+	return Config()->m_SvInactiveKickTime * 60;
+}
+
 void IGameController::DoTeamChange(CPlayer *pPlayer, int Team, bool DoChatMsg)
 {
 	Team = ClampTeam(Team);

src/game/server/gamecontroller.h

@@ -114,6 +114,7 @@ class IGameController
 	bool IsAmmoHudEnabled() const;
 	void SetAmmoHudEnabled(bool Enabled);
 
+	virtual float GetMaxInactiveTimeSeconds(const CPlayer *pPlayer) const;
 	virtual void DoWincheck();
 
 	// event

src/game/server/infclass/infcgamecontroller.cpp

@@ -5137,6 +5137,16 @@ void CInfClassGameController::CheckRoundFailed()
 	}
 }
 
+float CInfClassGameController::GetMaxInactiveTimeSeconds(const CPlayer *pPlayer) const
+{
+	const CInfClassPlayer *pInfPlayer = CInfClassPlayer::GetInstance(pPlayer);
+
+	int HumanMaxInactiveTimeSecs = Config()->m_InfInactiveHumansKickTime ? Config()->m_InfInactiveHumansKickTime : Config()->m_SvInactiveKickTime * 60;
+	int InfectedMaxInactiveTimeSecs = Config()->m_InfInactiveInfectedKickTime ? Config()->m_InfInactiveInfectedKickTime : Config()->m_SvInactiveKickTime * 60;
+
+	return pInfPlayer->IsHuman() ? HumanMaxInactiveTimeSecs : InfectedMaxInactiveTimeSecs;
+}
+
 void CInfClassGameController::DoWincheck()
 {
 	if(!IsWinCheckEnabled())

src/game/server/infclass/infcgamecontroller.h

@@ -126,6 +126,7 @@ class CInfClassGameController : public IGameController
 	void OnCharacterSpawned(CInfClassCharacter *pCharacter, const SpawnContext &Context);
 	void OnClassChooserRequested(CInfClassCharacter *pCharacter);
 	void CheckRoundFailed();
+	float GetMaxInactiveTimeSeconds(const CPlayer *pPlayer) const override;
 	void DoWincheck() override;
 	void StartRound() override;
 	void ResetRoundData();