diff --git a/src/engine/console.h b/src/engine/console.h index c3a7594fa..44b5c94b4 100644 --- a/src/engine/console.h +++ b/src/engine/console.h @@ -119,7 +119,7 @@ public: virtual void SetAccessLevel(int AccessLevel) = 0; - virtual void ResetServerGameSettings(int FlagMask) = 0; + virtual void ResetGameSettings() = 0; static LEVEL ToLogLevel(int ConsoleLevel); diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp index b862fd9b5..b2e3a0408 100644 --- a/src/engine/shared/console.cpp +++ b/src/engine/shared/console.cpp @@ -1263,13 +1263,13 @@ const IConsole::CCommandInfo *CConsole::GetCommandInfo(const char *pName, int Fl std::unique_ptr CreateConsole(int FlagMask) { return std::make_unique(FlagMask); } -void CConsole::ResetServerGameSettings(int FlagMask) +void CConsole::ResetGameSettings() { #define MACRO_CONFIG_INT(Name, ScriptName, Def, Min, Max, Flags, Desc) \ { \ - if(((Flags) & (CFGFLAG_SERVER | CFGFLAG_GAME)) == (CFGFLAG_SERVER | CFGFLAG_GAME)) \ + if(((Flags)&CFGFLAG_GAME) == CFGFLAG_GAME) \ { \ - CCommand *pCommand = FindCommand(#ScriptName, FlagMask); \ + CCommand *pCommand = FindCommand(#ScriptName, CFGFLAG_GAME); \ void *pUserData = pCommand->m_pUserData; \ FCommandCallback pfnCallback = pCommand->m_pfnCallback; \ TraverseChain(&pfnCallback, &pUserData); \ @@ -1282,9 +1282,9 @@ void CConsole::ResetServerGameSettings(int FlagMask) #define MACRO_CONFIG_STR(Name, ScriptName, Len, Def, Flags, Desc) \ { \ - if(((Flags) & (CFGFLAG_SERVER | CFGFLAG_GAME)) == (CFGFLAG_SERVER | CFGFLAG_GAME)) \ + if(((Flags)&CFGFLAG_GAME) == CFGFLAG_GAME) \ { \ - CCommand *pCommand = FindCommand(#ScriptName, FlagMask); \ + CCommand *pCommand = FindCommand(#ScriptName, CFGFLAG_GAME); \ void *pUserData = pCommand->m_pUserData; \ FCommandCallback pfnCallback = pCommand->m_pfnCallback; \ TraverseChain(&pfnCallback, &pUserData); \ diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h index 244b24125..d29b8a775 100644 --- a/src/engine/shared/console.h +++ b/src/engine/shared/console.h @@ -223,7 +223,7 @@ public: void InitChecksum(CChecksumData *pData) const override; void SetAccessLevel(int AccessLevel) override { m_AccessLevel = clamp(AccessLevel, (int)(ACCESS_LEVEL_ADMIN), (int)(ACCESS_LEVEL_USER)); } - void ResetServerGameSettings(int FlagMask) override; + void ResetGameSettings() override; // DDRace static void ConUserCommandStatus(IConsole::IResult *pResult, void *pUser); diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index a2027f417..524a55c1b 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -522,7 +522,7 @@ void CGameClient::OnConnected() m_GameWorld.m_WorldConfig.m_InfiniteAmmo = true; mem_zero(&m_GameInfo, sizeof(m_GameInfo)); m_PredictedDummyID = -1; - Console()->ResetServerGameSettings(CFGFLAG_GAME); + Console()->ResetGameSettings(); LoadMapSettings(); if(Client()->State() != IClient::STATE_DEMOPLAYBACK && g_Config.m_ClAutoDemoOnConnect) diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 20380ab9c..417881a60 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -3813,7 +3813,7 @@ void CGameContext::OnShutdown() } DeleteTempfile(); - Console()->ResetServerGameSettings(CFGFLAG_SERVER); + Console()->ResetGameSettings(); Collision()->Dest(); delete m_pController; m_pController = 0;