oof

include/angles.hpp

@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <core/logging.hpp>
 #include "common.hpp"
-
+#include <core/logging.hpp>
 namespace angles
 {
 

include/backpacktf.hpp

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "config.h"
 
 namespace backpacktf
 {

include/chatlog.hpp

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "config.h"
 #include <string>
 
 namespace chatlog

include/chatstack.hpp

@@ -9,6 +9,7 @@
 
 #define CHATSTACK_INTERVAL 0.8f
 
+#include "config.h"
 #include <string>
 #include <stack>
 #include <functional>

include/common.hpp

@@ -47,9 +47,8 @@
 #include "averager.hpp"
 
 #include "core/macros.hpp"
-#include <visual/colors.hpp>
-
 #if ENABLE_VISUALS
+#include <visual/colors.hpp>
 #include <visual/drawing.hpp>
 #include "visual/fidgetspinner.hpp"
 #include <visual/EffectGlow.hpp>

include/entitycache.hpp

@@ -64,6 +64,7 @@ bool IsProjectileACrit(CachedEntity *ent);
 class CachedEntity
 {
 public:
+    typedef CachedEntity ThisClass;
     CachedEntity();
     ~CachedEntity();
 

include/entityhitboxcache.hpp

@@ -14,6 +14,7 @@
 #include <studio.h>
 #include <stdexcept>
 
+class CachedEntity;
 #define CACHE_MAX_HITBOXES 64
 
 namespace hitbox_cache

include/hacks/ESP.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "common.hpp"
-
+#if ENABLE_VISUALS
 namespace hacks::shared::esp
 {
 
@@ -59,3 +59,4 @@ void AddEntityString(CachedEntity *entity, const std::string &string,
 void SetEntityColor(CachedEntity *entity, const rgba_t &color);
 void ResetEntityStrings();
 } // namespace hacks::shared::esp
+#endif

include/hacks/LightESP.hpp

@@ -2,7 +2,9 @@
 #include <hacks/Aimbot.hpp>
 namespace hacks::shared::lightesp
 {
+#if ENABLE_VISUALS
 void run();
 void draw();
 rgba_t LightESPColor(CachedEntity *ent);
+#endif
 } // namespace hacks::shared::lightesp

include/online/Online.hpp

@@ -5,7 +5,9 @@
 #pragma once
 
 #include <string>
+#if ENABLE_VISUALS
 #include <colors.hpp>
+#endif
 #include <config.h>
 #include <vector>
 
@@ -24,7 +26,9 @@ struct user_data
     bool no_target{ false };
     bool is_developer{};
     bool has_color{ false };
+#if ENABLE_VISUALS
     colors::rgba_t color{};
+#endif
     bool rainbow{ false };
 };
 

include/playerlist.hpp

@@ -24,8 +24,9 @@ enum class k_EState
     CAT,
     STATE_LAST = CAT
 };
-
+#if ENABLE_VISUALS
 extern rgba_t k_Colors[];
+#endif
 const std::string k_Names[]    = { "DEFAULT", "FRIEND", "RAGE", "IPC",
                                 "DEVELOPER" };
 const char *const k_pszNames[] = { "DEFAULT", "FRIEND", "RAGE", "IPC",
@@ -34,7 +35,9 @@ const char *const k_pszNames[] = { "DEFAULT", "FRIEND", "RAGE", "IPC",
 struct userdata
 {
     k_EState state{ k_EState::DEFAULT };
+#if ENABLE_VISUALS
     rgba_t color{ 0, 0, 0, 0 };
+#endif
     float inventory_value{ 0 };
     unsigned deaths_to{ 0 };
     unsigned kills{ 0 };
@@ -50,9 +53,10 @@ constexpr bool IsFriendly(k_EState state)
     return state == k_EState::DEVELOPER || state == k_EState::FRIEND ||
            state == k_EState::IPC;
 }
-
+#if ENABLE_VISUALS
 rgba_t Color(unsigned steamid);
 rgba_t Color(CachedEntity *player);
+#endif
 userdata &AccessData(unsigned steamid);
 userdata &AccessData(CachedEntity *player);
 bool IsDefault(unsigned steamid);

include/visual/CMakeLists.txt

@@ -5,8 +5,8 @@ target_sources(cathook PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/drawmgr.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/EffectChams.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/EffectGlow.hpp"
+	"${CMAKE_CURRENT_LIST_DIR}/EventLogging.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/fidgetspinner.hpp"
-        "${CMAKE_CURRENT_LIST_DIR}/EventLogging.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/SDLHooks.hpp")
 
 if(EnableGUI)

include/visual/colors.hpp

@@ -10,7 +10,7 @@
 #include <glez/color.hpp>
 
 class CachedEntity;
-
+#if ENABLE_VISUALS
 namespace colors
 {
 namespace chat
@@ -165,3 +165,4 @@ rgba_t EntityF(CachedEntity *ent);
 } // namespace colors
 
 using rgba_t = colors::rgba_t;
+#endif

src/EventLogging.cpp

@@ -1,10 +1,11 @@
 /*
   Created on 29.07.18.
 */
-
+#include "config.h"
 #include <EventLogging.hpp>
 #include <settings/Bool.hpp>
 #include <helpers.hpp>
+#if ENABLE_VISUALS
 #include <colors.hpp>
 #include <init.hpp>
 
@@ -166,3 +167,4 @@ bool event_logging::isEnabled()
 {
     return *enable;
 }
+#endif

src/angles.cpp

@@ -4,7 +4,6 @@
  *  Created on: Jun 5, 2017
  *      Author: nullifiedcat
  */
-
 #include "angles.hpp"
 
 namespace angles

src/backpacktf.cpp

@@ -4,13 +4,12 @@
  *  Created on: Jul 23, 2017
  *      Author: nullifiedcat
  */
-
+#include "config.h"
+#include "common.hpp"
 #include "backpacktf.hpp"
 #include "json.hpp"
 #include "https_request.hpp"
 
-#include "common.hpp"
-
 #include <thread>
 #include <queue>
 #include <settings/Bool.hpp>

src/hacks/Aimbot.cpp

@@ -10,7 +10,9 @@
 #include <hacks/AntiAim.hpp>
 #include <hacks/ESP.hpp>
 #include <hacks/Backtrack.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <PlayerTools.hpp>
 #include <settings/Bool.hpp>
 #include "common.hpp"

src/hacks/AntiAim.cpp

@@ -6,7 +6,6 @@
  */
 
 #include <hacks/hacklist.hpp>
-#include <glez/draw.hpp>
 #include <settings/Bool.hpp>
 #include <hacks/AntiAim.hpp>
 

src/hacks/AntiCheat.cpp

@@ -35,10 +35,12 @@ void Accuse(int eid, const std::string &hack, const std::string &details)
         }
         else
         {
+#if ENABLE_VISUALS
             PrintChat("\x07%06X%s\x01 (%s) suspected \x07%06X%s\x01: %s",
                       colors::chat::team(ENTITY(eid)->m_iTeam()), info.name,
                       classname(CE_INT(ent, netvar.iClass)), 0xe05938,
                       hack.c_str(), details.c_str());
+#endif
         }
     }
 }

src/hacks/AutoReflect.cpp

@@ -7,7 +7,9 @@
 
 #include "common.hpp"
 #include <hacks/AutoReflect.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 
 static settings::Bool enable{ "autoreflect.enable", "false" };

src/hacks/Backtrack.cpp

@@ -9,7 +9,9 @@
 #include "hacks/Aimbot.hpp"
 #include "hacks/Backtrack.hpp"
 #include <boost/circular_buffer.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 #include <hacks/Backtrack.hpp>
 

src/hacks/FollowBot.cpp

@@ -8,7 +8,9 @@
 
 #include "common.hpp"
 #include <hacks/FollowBot.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 
 static settings::Bool enable{ "follow-bot.enable", "false" };

src/hacks/LightESP.cpp

@@ -1,4 +1,6 @@
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 #include "hacks/LightESP.hpp"
 
@@ -71,7 +73,7 @@ void draw()
     }
 #endif
 }
-
+#if ENABLE_VISUALS
 rgba_t LightESPColor(CachedEntity *ent)
 {
     if (!playerlist::IsDefault(ent))
@@ -80,4 +82,5 @@ rgba_t LightESPColor(CachedEntity *ent)
     }
     return colors::green;
 }
+#endif
 } // namespace hacks::shared::lightesp

src/hacks/Misc.cpp

@@ -12,7 +12,9 @@
 #include <fcntl.h>
 #include <link.h>
 #include <hacks/AntiAim.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 
 #include "core/sharedobj.hpp"

src/hacks/NavBot.cpp

@@ -2,8 +2,6 @@
 // Created by bencat07 on 17.08.18.
 //
 #include "common.hpp"
-#include <glez/draw.hpp>
-#include <glez/color.hpp>
 #include "navparser.hpp"
 #include "FollowBot.hpp"
 #include "NavBot.hpp"

src/hacks/Radar.cpp

@@ -4,8 +4,9 @@
  *  Created on: Mar 28, 2017
  *      Author: nullifiedcat
  */
-
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Int.hpp>
 #include "common.hpp"
 #include "hacks/Radar.hpp"

src/hacks/Walkbot.cpp

@@ -12,7 +12,9 @@
 #include <sys/dir.h>
 #include <sys/stat.h>
 #include <hacks/hacklist.hpp>
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 
 static settings::Button recording_key{ "walkbot.recording-key", "<null>" };

src/hooks/LevelInit.cpp

@@ -5,7 +5,9 @@
 
 #include <hacks/hacklist.hpp>
 #include <settings/Bool.hpp>
+#if ENABLE_VISUALS
 #include <menu/GuiInterface.hpp>
+#endif
 #include "HookedMethods.hpp"
 #include "MiscTemporary.hpp"
 #include "navparser.hpp"
@@ -78,14 +80,13 @@ DEFINE_HOOKED_METHOD(LevelInit, void, void *this_, const char *name)
     logging::Info("Loaded Skybox: %s", succ ? "true" : "false");
     ConVar *holiday = g_ICvar->FindVar("tf_forced_holiday");
 
-    for (int i = 0; i < 32; i++)
-        g_Settings.brute.brutenum[i] = 0;
     if (halloween_mode)
         holiday->SetValue(2);
     else if (holiday->m_nValue == 2)
         holiday->SetValue(0);
 #endif
-
+    for (int i = 0; i < 32; i++)
+        g_Settings.brute.brutenum[i] = 0;
     g_IEngine->ClientCmd_Unrestricted("exec cat_matchexec");
 #if !LAGBOT_MODE
     hacks::shared::aimbot::Reset();

src/playerlist.cpp

@@ -18,14 +18,17 @@ namespace playerlist
 std::unordered_map<unsigned, userdata> data{};
 
 const userdata null_data{};
-
+#if ENABLE_VISUALS
 rgba_t k_Colors[] = { colors::empty, colors::FromRGBA8(99, 226, 161, 255),
                       colors::FromRGBA8(226, 204, 99, 255),
                       colors::FromRGBA8(232, 134, 6, 255), colors::empty };
-
+#endif
 bool ShouldSave(const userdata &data)
 {
+#if ENABLE_VISUALS
     return data.color || (data.state != k_EState::DEFAULT);
+#endif
+    return (data.state != k_EState::DEFAULT);
 }
 
 void Save()
@@ -114,7 +117,7 @@ void Load()
         logging::Info("Reading unsuccessful: %s", e.what());
     }
 }
-
+#if ENABLE_VISUALS
 rgba_t Color(unsigned steamid)
 {
     if (AccessData(steamid).state == k_EState::DEVELOPER)
@@ -137,7 +140,7 @@ rgba_t Color(CachedEntity *player)
         return Color(player->player_info.friendsID);
     return colors::empty;
 }
-
+#endif
 userdata &AccessData(unsigned steamid)
 {
     return data[steamid];
@@ -154,7 +157,10 @@ userdata &AccessData(CachedEntity *player)
 bool IsDefault(unsigned steamid)
 {
     const userdata &data = AccessData(steamid);
+#if ENABLE_VISUALS
     return data.state == k_EState::DEFAULT && !data.color.a;
+#endif
+    return data.state == k_EState ::DEFAULT;
 }
 
 bool IsDefault(CachedEntity *entity)
@@ -184,7 +190,7 @@ CatCommand pl_set_state(
         AccessData(steamid).state = state;
         logging::Info("Set %d to %d", steamid, state);
     });
-
+#if ENABLE_VISUALS
 CatCommand pl_set_color("pl_set_color", "pl_set_color uniqueid r g b",
                         [](const CCommand &args) {
                             if (args.ArgC() < 5)
@@ -201,7 +207,7 @@ CatCommand pl_set_color("pl_set_color", "pl_set_color uniqueid r g b",
                             AccessData(steamid).color = color;
                             logging::Info("Changed %d's color", steamid);
                         });
-
+#endif
 CatCommand pl_info("pl_info", "pl_info uniqueid", [](const CCommand &args) {
     if (args.ArgC() < 2)
     {

src/prediction.cpp

@@ -4,8 +4,9 @@
  *  Created on: Dec 5, 2016
  *      Author: nullifiedcat
  */
-
+#if ENABLE_VISUALS
 #include <glez/draw.hpp>
+#endif
 #include <settings/Bool.hpp>
 #include "common.hpp"
 

src/visual/CMakeLists.txt

@@ -5,10 +5,10 @@ target_sources(cathook PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/drawmgr.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/EffectChams.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/EffectGlow.cpp"
+	"${CMAKE_CURRENT_LIST_DIR}/EventLogging.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/fidgetspinner.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/EventLogging.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/SDLHooks.cpp")
 
 if(EnableGUI)
     add_subdirectory(menu)
-endif()
+endif()

src/visual/EventLogging.cpp

@@ -1,10 +1,11 @@
 /*
   Created on 29.07.18.
 */
-
+#include "config.h"
 #include <EventLogging.hpp>
 #include <settings/Bool.hpp>
 #include <helpers.hpp>
+#if ENABLE_VISUALS
 #include <colors.hpp>
 #include <init.hpp>
 
@@ -166,3 +167,4 @@ bool event_logging::isEnabled()
 {
     return *enable;
 }
+#endif