GameController: Refactor GameType as virtual getter

infclass · Dec 16, 2024 · 02d95c9 · 02d95c9
1 parent 3c6b904
commit 02d95c9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
@@ -1090,9 +1090,9 @@ void CGameContext::CheckPureTuning()
 	if(!m_pController)
 		return;
 
-	if(	str_comp(m_pController->m_pGameType, "DM")==0 ||
-		str_comp(m_pController->m_pGameType, "TDM")==0 ||
-		str_comp(m_pController->m_pGameType, "CTF")==0)
+	if(	str_comp(m_pController->GameType(), "DM")==0 ||
+		str_comp(m_pController->GameType(), "TDM")==0 ||
+		str_comp(m_pController->GameType(), "CTF")==0)
 	{
 		CTuningParams p;
 		if(mem_comp(&p, &m_Tuning, sizeof(p)) != 0)
@@ -4747,7 +4747,7 @@ int CGameContext::PersistentClientDataSize() const
 }
 
 CUuid CGameContext::GameUuid() const { return m_GameUuid; }
-const char *CGameContext::GameType() const { return m_pController && m_pController->m_pGameType ? m_pController->m_pGameType : ""; }
+const char *CGameContext::GameType() const { return m_pController ? m_pController->GameType() : ""; }
 const char *CGameContext::Version() const { return GAME_VERSION; }
 const char *CGameContext::NetVersion() const { return GAME_NETVERSION; }
 

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
@@ -86,7 +86,6 @@ IGameController::IGameController(class CGameContext *pGameServer)
 	m_pGameServer = pGameServer;
 	m_pConfig = m_pGameServer->Config();
 	m_pServer = m_pGameServer->Server();
-	m_pGameType = "unknown";
 
 	//
 	DoWarmup(g_Config.m_SvWarmup);
@@ -407,7 +406,7 @@ void IGameController::StartRound()
 	m_ForceBalanced = false;
 	Server()->DemoRecorder_HandleAutoStart();
 	char aBuf[256];
-	str_format(aBuf, sizeof(aBuf), "start round type='%s' teamplay='%d' id='%d'", m_pGameType, m_GameFlags&GAMEFLAG_TEAMS, m_RoundId);
+	str_format(aBuf, sizeof(aBuf), "start round type='%s' teamplay='%d' id='%d'", GameType(), m_GameFlags&GAMEFLAG_TEAMS, m_RoundId);
 	GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 }
 
@@ -1300,6 +1299,11 @@ void IGameController::DoWincheck()
 {
 }
 
+const char *IGameController::GameType() const
+{
+	return "unknown";
+}
+
 int IGameController::ClampTeam(int Team)
 {
 	if(Team < 0)

diff --git a/src/game/server/gamecontroller.h b/src/game/server/gamecontroller.h
@@ -92,8 +92,6 @@ class IGameController
 	bool m_ForceBalanced;
 
 public:
-	const char *m_pGameType;
-
 	void SkipMap();
 
 	bool IsTeamplay() const;
@@ -102,6 +100,8 @@ class IGameController
 	IGameController(class CGameContext *pGameServer);
 	virtual ~IGameController();
 
+	virtual const char *GameType() const;
+
 	virtual void DoWincheck();
 
 	// event

diff --git a/src/game/server/infclass/infcgamecontroller.cpp b/src/game/server/infclass/infcgamecontroller.cpp
@@ -158,8 +158,6 @@ IGameController *CreateInfclassModController(CGameContext *pGameServer) { return
 CInfClassGameController::CInfClassGameController(class CGameContext *pGameServer)
 : IGameController(pGameServer), m_Teams(pGameServer)
 {
-	m_pGameType = "InfClassR";
-
 	m_Teams.m_Core.m_IsInfclass = true;
 
 	for(std::vector<vec2> &vTeamSpawnPoints : m_avSpawnPoints)
@@ -211,6 +209,11 @@ CInfClassGameController::~CInfClassGameController()
 	if(m_GrowingMap) delete[] m_GrowingMap;
 }
 
+const char *CInfClassGameController::GameType() const
+{
+	return "InfClassR";
+}
+
 void CInfClassGameController::IncreaseCurrentRoundCounter()
 {
 	IGameController::IncreaseCurrentRoundCounter();

diff --git a/src/game/server/infclass/infcgamecontroller.h b/src/game/server/infclass/infcgamecontroller.h
@@ -81,6 +81,8 @@ class CInfClassGameController : public IGameController
 	CInfClassGameController(class CGameContext *pGameServer);
 	~CInfClassGameController() override;
 
+	const char *GameType() const override;
+
 	void IncreaseCurrentRoundCounter() override;
 
 	void DoTeamBalance() override;