From 37460378a831b27a1a1973b124b2522eba873b6c Mon Sep 17 00:00:00 2001 From: superp00t Date: Mon, 14 Aug 2023 23:00:04 -0400 Subject: [PATCH] feat(console): toggle console access based on -console flag --- src/client/Client.hpp | 41 ----------------------------------------- src/console/Device.cpp | 4 ++-- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/src/client/Client.hpp b/src/client/Client.hpp index c8a4e84..7d3f60b 100644 --- a/src/client/Client.hpp +++ b/src/client/Client.hpp @@ -4,47 +4,6 @@ #include "event/Event.hpp" #include -enum CMDOPT { - CMD_D3D = 0, - CMD_D3D9EX = 1, - CMD_DATA_DIR = 2, - CMD_NO_LAG_FIX = 3, - CMD_LOADFILE = 4, - CMD_GAMETYPE = 5, - CMD_OPENGL = 6, - CMD_SW_TNL = 7, - CMD_TIMEDEMO = 8, - CMD_DEMOREZ = 9, - CMD_DEMODEPTH = 10, - CMD_DEMODETAIL = 11, - CMD_DEMOSOUND = 12, - CMD_FULL_SCREEN = 13, - CMD_22050HZ = 14, - CMD_NO_WARNINGS = 15, - CMDOPTS -}; - -enum WOWCMDOPT { - WOWCMD_RES_800x600 = 16, - WOWCMD_RES_1024x768 = 17, - WOWCMD_RES_1280x960 = 18, - WOWCMD_RES_1280x1024 = 19, - WOWCMD_RES_1600x1200 = 20, - WOWCMD_UP_TO_DATE = 21, - WOWCMD_16_BIT = 22, - WOWCMD_NO_FIX_LAG = 24, - WOWCMD_NO_SOUND = 26, - WOWCMD_SOUND_CHAOS = 27, - WOWCMD_DEPTH_16 = 29, - WOWCMD_DEPTH_24 = 30, - WOWCMD_DEPTH_32 = 31, - WOWCMD_WINDOWED = 32, - WOWCMD_CONSOLE = 35, - WOWCMD_HW_DETECT = 36, - WOWCMD_GX_OVERRIDE = 39, - WOWCMD_OPTS -}; - class CVar; namespace Client { diff --git a/src/console/Device.cpp b/src/console/Device.cpp index ebb169a..d3be839 100644 --- a/src/console/Device.cpp +++ b/src/console/Device.cpp @@ -1,4 +1,5 @@ #include "console/Device.hpp" +#include "client/CmdLine.hpp" #include "client/Gui.hpp" #include "console/Console.hpp" #include "console/CVar.hpp" @@ -148,8 +149,7 @@ void ConsoleDeviceInitialize(const char* title) { // TODO proper logic s_hwDetect = true; - // TODO ConsoleAccessSetEnabled(CmdLineGetBool(35)); - ConsoleAccessSetEnabled(1); + ConsoleAccessSetEnabled(CmdLineGetBool(WOWCMD_CONSOLE)); // TODO