From 57e2905e2426d92f1bdb0f2d2ddcd528076dd78e Mon Sep 17 00:00:00 2001 From: def Date: Mon, 7 Sep 2020 15:40:20 +0200 Subject: [PATCH] Clean up econ stuff, don't need it --- autoexec_server.cfg | 9 -------- src/engine/shared/config_variables.h | 2 +- src/game/client/components/binds.cpp | 5 +---- src/game/client/components/console.cpp | 29 ++------------------------ src/game/client/components/console.h | 5 ----- 5 files changed, 4 insertions(+), 46 deletions(-) diff --git a/autoexec_server.cfg b/autoexec_server.cfg index 5e61cfd9b..3986fc3c0 100644 --- a/autoexec_server.cfg +++ b/autoexec_server.cfg @@ -200,15 +200,6 @@ sv_client_suggestion_bot "Your client has bots and can be remotely controlled!\n -# EXTERNAL CONSOLE -# ---------------- - -ec_bindaddr localhost -ec_port 7303 -ec_output_level 1 - - - # CUSTOM CONFIG # ------------- diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 95970eb10..fc6851a53 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -182,7 +182,7 @@ MACRO_CONFIG_INT(SvHit, sv_hit, 1, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Whether p MACRO_CONFIG_INT(SvEndlessDrag, sv_endless_drag, 0, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Turns endless hooking on/off") MACRO_CONFIG_INT(SvTestingCommands, sv_test_cmds, 0, 0, 1, CFGFLAG_SERVER, "Turns testing commands aka cheats on/off (setting only works in initial config)") MACRO_CONFIG_INT(SvFreezeDelay, sv_freeze_delay, 3, 1, 30, CFGFLAG_SERVER|CFGFLAG_GAME, "How many seconds the players will remain frozen (applies to all except delayed freeze in switch layer & deepfreeze)") -MACRO_CONFIG_INT(ClDDRaceBindsSet, cl_race_binds_set, 0, 0, 2, CFGFLAG_CLIENT|CFGFLAG_SAVE, "What level the DDRace binds are set to (this is automated, you don't need to use this)") +MACRO_CONFIG_INT(ClDDRaceBindsSet, cl_race_binds_set, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "What level the DDRace binds are set to (this is automated, you don't need to use this)") MACRO_CONFIG_INT(SvEndlessSuperHook, sv_endless_super_hook, 0, 0, 1, CFGFLAG_SERVER, "Endless hook for super players on/off") MACRO_CONFIG_INT(SvHideScore, sv_hide_score, 0, 0, 1, CFGFLAG_SERVER, "Whether players scores will be announced or not") MACRO_CONFIG_INT(SvSaveWorseScores, sv_save_worse_scores, 1, 0, 1, CFGFLAG_SERVER|CFGFLAG_GAME, "Whether to save worse scores when you already have a better one") diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index d4683c69e..469fc626d 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -445,9 +445,6 @@ void CBinds::ConfigSaveCallback(IConfig *pConfig, void *pUserData) void CBinds::SetDDRaceBinds(bool FreeOnly) { - if(g_Config.m_ClDDRaceBindsSet < 2) - Bind(KEY_F7, "toggle_econ_console", FreeOnly); - if(g_Config.m_ClDDRaceBindsSet < 1) { Bind(KEY_KP_PLUS, "zoom+", FreeOnly); @@ -480,5 +477,5 @@ void CBinds::SetDDRaceBinds(bool FreeOnly) Bind(KEY_EQUALS, "spectate_next", FreeOnly); } - g_Config.m_ClDDRaceBindsSet = 2; + g_Config.m_ClDDRaceBindsSet = 1; } diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp index 74d88854b..5da3c39b7 100644 --- a/src/game/client/components/console.cpp +++ b/src/game/client/components/console.cpp @@ -355,7 +355,7 @@ void CGameConsole::CInstance::PrintLine(const char *pLine, bool Highlighted) } CGameConsole::CGameConsole() -: m_LocalConsole(CONSOLETYPE_LOCAL), m_RemoteConsole(CONSOLETYPE_REMOTE), m_EconConsole(CONSOLETYPE_ECON) +: m_LocalConsole(CONSOLETYPE_LOCAL), m_RemoteConsole(CONSOLETYPE_REMOTE) { m_ConsoleType = CONSOLETYPE_LOCAL; m_ConsoleState = CONSOLE_CLOSED; @@ -373,8 +373,6 @@ CGameConsole::CInstance *CGameConsole::CurrentConsole() { if(m_ConsoleType == CONSOLETYPE_REMOTE) return &m_RemoteConsole; - if(m_ConsoleType == CONSOLETYPE_ECON) - return &m_EconConsole; return &m_LocalConsole; } @@ -505,8 +503,6 @@ void CGameConsole::OnRender() Graphics()->SetColor(0.2f, 0.2f, 0.2f,0.9f); if(m_ConsoleType == CONSOLETYPE_REMOTE) Graphics()->SetColor(0.4f, 0.2f, 0.2f,0.9f); - else if(m_ConsoleType == CONSOLETYPE_ECON) - Graphics()->SetColor(0.2f, 0.2f, 0.4f,0.9f); Graphics()->QuadsSetSubset(0,-ConsoleHeight*0.075f,Screen.w*0.075f*0.5f,0); QuadItem = IGraphics::CQuadItem(0, 0, Screen.w, ConsoleHeight); Graphics()->QuadsDrawTL(&QuadItem, 1); @@ -786,7 +782,7 @@ void CGameConsole::Toggle(int Type) void CGameConsole::Dump(int Type) { - CInstance *pConsole = Type == CONSOLETYPE_REMOTE ? &m_RemoteConsole : Type == CONSOLETYPE_ECON ? &m_EconConsole : &m_LocalConsole; + CInstance *pConsole = Type == CONSOLETYPE_REMOTE ? &m_RemoteConsole : &m_LocalConsole; char aFilename[128]; char aDate[20]; @@ -814,11 +810,6 @@ void CGameConsole::ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUse ((CGameConsole *)pUserData)->Toggle(CONSOLETYPE_REMOTE); } -void CGameConsole::ConToggleEconConsole(IConsole::IResult *pResult, void *pUserData) -{ - ((CGameConsole *)pUserData)->Toggle(CONSOLETYPE_ECON); -} - void CGameConsole::ConClearLocalConsole(IConsole::IResult *pResult, void *pUserData) { ((CGameConsole *)pUserData)->m_LocalConsole.ClearBacklog(); @@ -829,11 +820,6 @@ void CGameConsole::ConClearRemoteConsole(IConsole::IResult *pResult, void *pUser ((CGameConsole *)pUserData)->m_RemoteConsole.ClearBacklog(); } -void CGameConsole::ConClearEconConsole(IConsole::IResult *pResult, void *pUserData) -{ - ((CGameConsole *)pUserData)->m_EconConsole.ClearBacklog(); -} - void CGameConsole::ConDumpLocalConsole(IConsole::IResult *pResult, void *pUserData) { ((CGameConsole *)pUserData)->Dump(CONSOLETYPE_LOCAL); @@ -844,11 +830,6 @@ void CGameConsole::ConDumpRemoteConsole(IConsole::IResult *pResult, void *pUserD ((CGameConsole *)pUserData)->Dump(CONSOLETYPE_REMOTE); } -void CGameConsole::ConDumpEconConsole(IConsole::IResult *pResult, void *pUserData) -{ - ((CGameConsole *)pUserData)->Dump(CONSOLETYPE_ECON); -} - void CGameConsole::ClientConsolePrintCallback(const char *pStr, void *pUserData, bool Highlighted) { ((CGameConsole *)pUserData)->m_LocalConsole.PrintLine(pStr, Highlighted); @@ -893,8 +874,6 @@ void CGameConsole::PrintLine(int Type, const char *pLine) m_LocalConsole.PrintLine(pLine); else if(Type == CONSOLETYPE_REMOTE) m_RemoteConsole.PrintLine(pLine); - else if(Type == CONSOLETYPE_ECON) - m_EconConsole.PrintLine(pLine); } void CGameConsole::OnConsoleInit() @@ -902,7 +881,6 @@ void CGameConsole::OnConsoleInit() // init console instances m_LocalConsole.Init(this); m_RemoteConsole.Init(this); - m_EconConsole.Init(this); m_pConsole = Kernel()->RequestInterface(); @@ -911,13 +889,10 @@ void CGameConsole::OnConsoleInit() Console()->Register("toggle_local_console", "", CFGFLAG_CLIENT, ConToggleLocalConsole, this, "Toggle local console"); Console()->Register("toggle_remote_console", "", CFGFLAG_CLIENT, ConToggleRemoteConsole, this, "Toggle remote console"); - Console()->Register("toggle_econ_console", "", CFGFLAG_CLIENT, ConToggleEconConsole, this, "Toggle econ console"); Console()->Register("clear_local_console", "", CFGFLAG_CLIENT, ConClearLocalConsole, this, "Clear local console"); Console()->Register("clear_remote_console", "", CFGFLAG_CLIENT, ConClearRemoteConsole, this, "Clear remote console"); - Console()->Register("clear_econ_console", "", CFGFLAG_CLIENT, ConClearEconConsole, this, "Clear econ console"); Console()->Register("dump_local_console", "", CFGFLAG_CLIENT, ConDumpLocalConsole, this, "Dump local console"); Console()->Register("dump_remote_console", "", CFGFLAG_CLIENT, ConDumpRemoteConsole, this, "Dump remote console"); - Console()->Register("dump_econ_console", "", CFGFLAG_CLIENT, ConDumpEconConsole, this, "Dump econ console"); Console()->Register("console_page_up", "", CFGFLAG_CLIENT, ConConsolePageUp, this, "Previous page in console"); Console()->Register("console_page_down", "", CFGFLAG_CLIENT, ConConsolePageDown, this, "Next page in console"); diff --git a/src/game/client/components/console.h b/src/game/client/components/console.h index f4b5b3f38..d33722f0c 100644 --- a/src/game/client/components/console.h +++ b/src/game/client/components/console.h @@ -71,7 +71,6 @@ class CGameConsole : public CComponent CInstance m_LocalConsole; CInstance m_RemoteConsole; - CInstance m_EconConsole; CInstance *CurrentConsole(); float TimeNow(); @@ -89,13 +88,10 @@ class CGameConsole : public CComponent static void ClientConsolePrintCallback(const char *pStr, void *pUserData, bool Highlighted); static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData); static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData); - static void ConToggleEconConsole(IConsole::IResult *pResult, void *pUserData); static void ConClearLocalConsole(IConsole::IResult *pResult, void *pUserData); static void ConClearRemoteConsole(IConsole::IResult *pResult, void *pUserData); - static void ConClearEconConsole(IConsole::IResult *pResult, void *pUserData); static void ConDumpLocalConsole(IConsole::IResult *pResult, void *pUserData); static void ConDumpRemoteConsole(IConsole::IResult *pResult, void *pUserData); - static void ConDumpEconConsole(IConsole::IResult *pResult, void *pUserData); static void ConConsolePageUp(IConsole::IResult *pResult, void *pUserData); static void ConConsolePageDown(IConsole::IResult *pResult, void *pUserData); static void ConchainConsoleOutputLevelUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData); @@ -105,7 +101,6 @@ public: { CONSOLETYPE_LOCAL=0, CONSOLETYPE_REMOTE, - CONSOLETYPE_ECON, }; CGameConsole();