From 88a714f00f8e0d9c5f07db71ed4fe8bec1c09423 Mon Sep 17 00:00:00 2001
From: TotallyNotElite <1yourexperiment@protonmail.com>
Date: Sat, 31 Aug 2019 19:17:16 +0200
Subject: [PATCH] Make textmode an entry in Visuals_DrawType and misc textmode
 fixes

---
 CMakeLists.txt            | 16 +++++++++-------
 src/entityhitboxcache.cpp |  2 +-
 src/hack.cpp              |  2 +-
 src/hooks/CMakeLists.txt  |  3 ++-
 src/hooks/Paint.cpp       |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d497ea9..f32f1530 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,20 +39,23 @@ set(GameValues "tf2;hl2dm;dab;tf2c;css;dynamic" CACHE INTERNAL "List of supporte
 set_property(CACHE Game PROPERTY STRINGS ${GameValues})
 
 set(Visuals_DrawType "IMGUI" CACHE STRING "Target drawing api")
-set(DrawTypes "No Visuals;Glez;Engine;IMGUI;IMGUI Streamproof" CACHE INTERNAL "Select the drawing api that cathook should use")
+set(DrawTypes "Textmode;No Visuals;Glez;Engine;IMGUI;IMGUI Streamproof" CACHE INTERNAL "Select the drawing api that cathook should use")
 set_property(CACHE Visuals_DrawType PROPERTY STRINGS ${DrawTypes})
 set(Visuals_EnforceStreamSafety 1 CACHE BOOL "If a streamsafe drawing method is used, this will remove features that are not streamsafe.")
 
-set(EnableVisuals 0)
+set(EnableVisuals 1)
 set(EnableGlezDrawing 0)
 set(EnableEngineDrawing 0)
 set(EnableImGuiDrawing 0)
 set(ExternalDrawing 0)
+set(Textmode 0)
 
-if(NOT Visuals_DrawType STREQUAL "No Visuals")
-    set(EnableVisuals 1)
-endif()
-if(Visuals_DrawType STREQUAL "Glez")
+if(Visuals_DrawType STREQUAL "Textmode")
+    set(EnableVisuals 0)
+    set(Textmode 1)
+elseif(Visuals_DrawType STREQUAL "No Visuals")
+    set(EnableVisuals 0)
+elseif(Visuals_DrawType STREQUAL "Glez")
     set(EnableGlezDrawing 1)
 elseif(Visuals_DrawType STREQUAL "Engine")
     set(EnableEngineDrawing 1)
@@ -73,7 +76,6 @@ set(EnableGUI 1 CACHE BOOL "Enable GUI")
 set(EnableIPC 1 CACHE BOOL "Enable IPC")
 set(DataPath "/opt/cathook/data" CACHE FILEPATH "Data location")
 set(VACBypass 0 CACHE BOOL "Textmode VAC bypass")
-set(Textmode 0 CACHE BOOL "Various textmode-only features for bots")
 set(EnableTextmodeStdin 0 CACHE BOOL "Textmode Stdin -> Console bridge (EXPERIMENTAL)")
 set(EnableWarnings 0 CACHE BOOL "Enable compile warnings")
 set(EnableOnlineFeatures 0 CACHE BOOL "Enable online features (WIP)")
diff --git a/src/entityhitboxcache.cpp b/src/entityhitboxcache.cpp
index 2f94473e..02f7c532 100644
--- a/src/entityhitboxcache.cpp
+++ b/src/entityhitboxcache.cpp
@@ -128,7 +128,7 @@ matrix3x4_t *EntityHitboxCache::GetBones()
     {
         if (g_Settings.is_create_move)
         {
-#if ENABLE_VISUALS
+#if TEXTMODE
             if (!*bonecache_enabled || parent_ref->m_Type() != ENTITY_PLAYER || IsPlayerInvisible(parent_ref))
             {
                 PROF_SECTION(bone_setup);
diff --git a/src/hack.cpp b/src/hack.cpp
index bee6188b..510944d0 100644
--- a/src/hack.cpp
+++ b/src/hack.cpp
@@ -585,7 +585,7 @@ free(logname);*/
         init_stack().pop();
     }
     logging::Info("Initializer stack done");
-#if not ENABLE_VISUALS
+#if TEXTMODE
     hack::command_stack().push("exec cat_autoexec_textmode");
 #else
     hack::command_stack().push("exec cat_autoexec");
diff --git a/src/hooks/CMakeLists.txt b/src/hooks/CMakeLists.txt
index 71840c52..2b52f158 100755
--- a/src/hooks/CMakeLists.txt
+++ b/src/hooks/CMakeLists.txt
@@ -23,6 +23,7 @@ set(ignore_files ${ignore_files} CACHE INTERNAL "")
 
 if(EnableVisuals)
     add_subdirectory(visual)
-elseif(Textmode)
+endif()
+if(Textmode)
     add_subdirectory(textmode)
 endif()
diff --git a/src/hooks/Paint.cpp b/src/hooks/Paint.cpp
index a91fa5d0..6bee1482 100644
--- a/src/hooks/Paint.cpp
+++ b/src/hooks/Paint.cpp
@@ -89,7 +89,7 @@ DEFINE_HOOKED_METHOD(Paint, void, IEngineVGui *this_, PaintMode_t mode)
         EC::run(EC::Paint);
     }
 
-#if !ENABLE_VISUALS
+#if TEXTMODE
     return;
 #else
     return original::Paint(this_, mode);