Moved reg cvar sv_alltalk, voice_serverdebug into GameDLLInit

rehlds · Nov 27, 2017 · 519a731 · 519a731
1 parent 0318c36
commit 519a731
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/regamedll/dlls/game.cpp b/regamedll/dlls/game.cpp
@@ -276,4 +276,8 @@ void EXT_FUNC GameDLLInit()
 	Bot_RegisterCVars();
 	Tutor_RegisterCVars();
 	Hostage_RegisterCVars();
+
+#ifdef REGAMEDLL_FIXES
+	VoiceGameMgr_RegisterCVars();
+#endif
 }
diff --git a/regamedll/game_shared/voice_gamemgr.cpp b/regamedll/game_shared/voice_gamemgr.cpp
@@ -44,6 +44,16 @@ CVoiceGameMgr::~CVoiceGameMgr()
 	;
 }
 
+void VoiceGameMgr_RegisterCVars()
+{
+	// register voice_serverdebug if it hasn't been registered already
+	if (!CVAR_GET_POINTER("voice_serverdebug"))
+		CVAR_REGISTER(&voice_serverdebug);
+
+	if (!CVAR_GET_POINTER("sv_alltalk"))
+		CVAR_REGISTER(&sv_alltalk);
+}
+
 bool CVoiceGameMgr::Init(IVoiceGameMgrHelper *pHelper, int maxClients)
 {
 	m_pHelper = pHelper;
@@ -54,12 +64,9 @@ bool CVoiceGameMgr::Init(IVoiceGameMgrHelper *pHelper, int maxClients)
 	m_msgPlayerVoiceMask = REG_USER_MSG("VoiceMask", VOICE_MAX_PLAYERS_DW * 4 * 2);
 	m_msgRequestState = REG_USER_MSG("ReqState", 0);
 
-	// register voice_serverdebug if it hasn't been registered already
-	if (!CVAR_GET_POINTER("voice_serverdebug"))
-		CVAR_REGISTER(&voice_serverdebug);
-
-	if (!CVAR_GET_POINTER("sv_alltalk"))
-		CVAR_REGISTER(&sv_alltalk);
+#ifndef REGAMEDLL_FIXES
+	VoiceGameMgr_RegisterCVars();
+#endif
 
 	return true;
 }

diff --git a/regamedll/game_shared/voice_gamemgr.h b/regamedll/game_shared/voice_gamemgr.h
@@ -84,4 +84,5 @@ class CVoiceGameMgr
 
 extern cvar_t sv_alltalk;
 
+void VoiceGameMgr_RegisterCVars();
 void VoiceServerDebug(const char *pFmt, ...);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,4 +84,5 @@ class CVoiceGameMgr

		extern cvar_t sv_alltalk;

		void VoiceGameMgr_RegisterCVars();
		void VoiceServerDebug(const char *pFmt, ...);