first compile

include/MiscTemporary.hpp

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <settings/Bool.hpp>
 #include "common.hpp"
 
 // This is a temporary file to put code that needs moving/refactoring in.
@@ -21,3 +22,9 @@ extern int prevflowticks;
 extern int spectator_target;
 extern CLC_VoiceData *voicecrash;
 #endif
+
+extern settings::Bool clean_screenshots;
+extern settings::Bool crypt_chat;
+extern settings::Bool nolerp;
+extern settings::Bool no_zoom;
+extern settings::Bool disable_visuals;

src/MiscTemporary.cpp

@@ -13,3 +13,9 @@ bool firstcm = false;
 Timer DelayTimer{};
 float prevflow    = 0.0f;
 int prevflowticks = 0;
+
+settings::Bool crypt_chat{ "chat.crypto", "false" };
+settings::Bool clean_screenshots{ "visual.clean-screenshots", "false" };
+settings::Bool nolerp{ "misc.no-lerp", "false" };
+settings::Bool no_zoom{ "remove.scope", "false" };
+settings::Bool disable_visuals{ "visual.disable", "false" };

src/hooks/CreateMove.cpp

@@ -16,7 +16,6 @@
 #include "HookedMethods.hpp"
 
 static settings::Bool minigun_jump{ "misc.minigun-jump-tf2c", "false" };
-static settings::Bool nolerp{ "misc.no-lerp", "false" };
 static settings::Button roll_speedhack{ "misc.roll-speedhack", "false" };
 static settings::Bool engine_pred{ "misc.engine-prediction", "false" };
 static settings::Bool debug_projectiles{ "debug.projectiles", "false" };

src/hooks/DispatchUserMessage.cpp

@@ -11,10 +11,10 @@
 #include <settings/Bool.hpp>
 #include "HookedMethods.hpp"
 
-static settings::Bool clean_chat{ "misc.clean-chat", "false" };
+static settings::Bool clean_chat{ "chat.clean", "false" };
 static settings::Bool dispatch_log{ "debug.log-dispatch-user-msg", "false" };
-static settings::String chat_filter{ "misc.chat-censor.filter", "" };
+static settings::String chat_filter{ "chat.censor.filter", "" };
-static settings::Bool chat_filter_enable{ "misc.chat-censor.enable", "false" };
+static settings::Bool chat_filter_enable{ "chat.censor.enable", "false" };
 
 static bool retrun = false;
 static Timer sendmsg{};
@@ -69,9 +69,9 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
                         message.push_back(c);
                 }
             }
-            if (chat_filter_enabled && data[0] != LOCAL_E->m_IDX)
+            if (chat_filter_enable && data[0] != LOCAL_E->m_IDX)
             {
-                if (!strcmp(chat_filter.GetString(), ""))
+                if (chat_filter)
                 {
                     std::string tmp  = {};
                     std::string tmp2 = {};
@@ -189,7 +189,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
                 }
                 else if (data[0] != LOCAL_E->m_IDX)
                 {
-                    std::string input = chat_filter.GetString();
+                    std::string input = *chat_filter;
                     boost::to_lower(input);
                     std::string message2 = message;
                     std::vector<std::string> result{};
@@ -215,10 +215,10 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
                     }
                 }
             }
-#if not LAGBOT_MODE
+#if !LAGBOT_MODE
-            if (sendmsg.test_and_set(300000) &&
+            /*if (sendmsg.test_and_set(300000) &&
                 hacks::shared::antiaim::communicate)
-                chat_stack::Say("!!meow");
+                chat_stack::Say("!!meow");*/
 #endif
             if (crypt_chat)
             {
@@ -226,8 +226,8 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
                 {
                     if (ucccccp::validate(message))
                     {
-#if not LAGBOT_MODE
+#if !LAGBOT_MODE
-                        if (ucccccp::decrypt(message) == "meow" &&
+/*                        if (ucccccp::decrypt(message) == "meow" &&
                             hacks::shared::antiaim::communicate &&
                             data[0] != LOCAL_E->m_IDX &&
                             playerlist::AccessData(ENTITY(data[0])).state !=
@@ -236,7 +236,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
                             playerlist::AccessData(ENTITY(data[0])).state =
                                 playerlist::k_EState::CAT;
                             chat_stack::Say("!!meow");
-                        }
+                        }*/
 #endif
                         PrintChat("\x07%06X%s\x01: %s", 0xe05938, name.c_str(),
                                   ucccccp::decrypt(message).c_str());
@@ -261,7 +261,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type,
         logging::Info("MESSAGE %d, DATA = [ %s ]", type, str.str().c_str());
         buf.Seek(0);
     }
-    votelogger::user_message(buf, type);
+    votelogger::dispatchUserMessage(buf, type);
     return original::DispatchUserMessage(this_, type, buf);
 }
 }

src/hooks/SendDatagram.cpp

@@ -10,12 +10,12 @@ namespace hooked_methods
 {
 DEFINE_HOOKED_METHOD(SendDatagram, int, INetChannel *ch, bf_write *buf)
 {
-#if not LAGBOT_MODE
+#if !LAGBOT_MODE
     int in     = ch->m_nInSequenceNr;
     auto state = ch->m_nInReliableState;
 
     float latencysend =
-        round((round(((float) hacks::shared::backtrack::latency - 0.5f) /
+        round((round((hacks::shared::backtrack::getLatency() - 0.5f) /
                      15.1515151515f) -
                0.5f) *
               15.1515151515f);
@@ -23,7 +23,7 @@ DEFINE_HOOKED_METHOD(SendDatagram, int, INetChannel *ch, bf_write *buf)
 #endif
 
     int ret = original::SendDatagram(ch, buf);
-#if not LAGBOT_MODE
+#if !LAGBOT_MODE
 
     ch->m_nInSequenceNr    = in;
     ch->m_nInReliableState = state;

src/hooks/SendNetMsg.cpp

@@ -7,6 +7,7 @@
 #include <MiscTemporary.hpp>
 #include <settings/Int.hpp>
 #include "HookedMethods.hpp"
+#include <MiscTemporary.hpp>
 
 static settings::Int newlines_msg{ "chat.prefix-newlines", "0" };
 static settings::Bool log_sent{ "debug.log-sent-chat", "false" };

src/hooks/visual/DrawModelExecute.cpp

@@ -17,13 +17,10 @@ DEFINE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *this_,
                      const DrawModelState_t &state,
                      const ModelRenderInfo_t &info, matrix3x4_t *bone)
 {
-    static const char *name;
+    if (!isHackActive())
-    static std::string sname;
+        return;
-    static IClientUnknown *unk;
-    static IClientEntity *ent;
 
-    if (!cathook ||
+    if (!(spectator_target || no_arms || no_hats ||
-        !(spectator_target || no_arms || no_hats ||
           (clean_screenshots && g_IEngine->IsTakingScreenshot()) ||
           CE_BAD(LOCAL_E) || !LOCAL_E->m_bAlivePlayer()))
     {
@@ -36,10 +33,10 @@ DEFINE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *this_,
     {
         if (info.pModel)
         {
-            name = g_IModelInfo->GetModelName(info.pModel);
+            const char *name = g_IModelInfo->GetModelName(info.pModel);
             if (name)
             {
-                sname = name;
+                std::string sname = name;
                 if (no_arms && sname.find("arms") != std::string::npos)
                 {
                     return;
@@ -53,10 +50,10 @@ DEFINE_HOOKED_METHOD(DrawModelExecute, void, IVModelRender *this_,
         }
     }
 
-    unk = info.pRenderable->GetIClientUnknown();
+    IClientUnknown *unk = info.pRenderable->GetIClientUnknown();
     if (unk)
     {
-        ent = unk->GetIClientEntity();
+        IClientEntity *ent = unk->GetIClientEntity();
         if (ent)
         {
             if (ent->entindex() == spectator_target)

src/hooks/visual/FrameStageNotify.cpp

@@ -6,6 +6,7 @@
 #include <MiscTemporary.hpp>
 #include <hacks/hacklist.hpp>
 #include <settings/Bool.hpp>
+#include <hacks/Thirdperson.hpp>
 #include "HookedMethods.hpp"
 #if not LAGBOT_MODE
 #include "hacks/Backtrack.hpp"
@@ -13,6 +14,8 @@
 
 static settings::Float nightmode{ "visual.night-mode", "0" };
 
+static float old_nightmode{ 0.0f };
+
 namespace hooked_methods
 {
 #include "reclasses.hpp"
@@ -20,10 +23,13 @@ namespace hooked_methods
 DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
                      ClientFrameStage_t stage)
 {
-    static float OldNightmode = 0.0f;
+    if (!isHackActive())
-    if (OldNightmode != (float) nightmode)
+        return original::FrameStageNotify(this_, stage);
-    {
 
+    PROF_SECTION(FrameStageNotify_TOTAL);
+
+    if (old_nightmode != *nightmode)
+    {
         static ConVar *r_DrawSpecificStaticProp =
             g_ICvar->FindVar("r_DrawSpecificStaticProp");
         if (!r_DrawSpecificStaticProp)
@@ -62,18 +68,16 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
                     pMaterial->ColorModulate(1.0f, 1.0f, 1.0f);
             }
         }
-        OldNightmode = nightmode;
+        old_nightmode = *nightmode;
     }
 
-    PROF_SECTION(FrameStageNotify_TOTAL);
-
     if (!g_IEngine->IsInGame())
         g_Settings.bInvalid = true;
     {
         PROF_SECTION(FSN_skinchanger);
         hacks::tf2::skinchanger::FrameStageNotify(stage);
     }
-    if (cathook && stage == FRAME_RENDER_START)
+    if (isHackActive() && stage == FRAME_RENDER_START)
     {
         INetChannel *ch;
         ch = (INetChannel *) g_IEngine->GetNetChannelInfo();
@@ -97,11 +101,11 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_,
         	hooks::firebullets.Apply();
         }
     }
-    if (cathook && !g_Settings.bInvalid && stage == FRAME_RENDER_START)
+    if (isHackActive() && !g_Settings.bInvalid && stage == FRAME_RENDER_START)
     {
         IF_GAME(IsTF())
         {
-            if (CE_GOOD(LOCAL_E) && no_zoom)
+            if (no_zoom && CE_GOOD(LOCAL_E))
                 RemoveCondition<TFCond_Zoomed>(LOCAL_E);
         }
         hacks::tf::thirdperson::frameStageNotify();

src/hooks/visual/OverrideView.cpp

@@ -16,20 +16,18 @@ namespace hooked_methods
 
 DEFINE_HOOKED_METHOD(OverrideView, void, void *this_, CViewSetup *setup)
 {
-    static bool zoomed;
     original::OverrideView(this_, setup);
-    if (!cathook)
+
+    if (!isHackActive())
         return;
+
     if (g_pLocalPlayer->bZoomed && override_fov_zoomed)
     {
-        setup->fov = override_fov_zoomed;
+        setup->fov = *override_fov_zoomed;
     }
-    else
+    else if (override_fov)
     {
-        if (override_fov)
+        setup->fov = *override_fov;
-        {
-            setup->fov = override_fov;
-        }
     }
 
     if (spectator_target)
@@ -81,7 +79,7 @@ DEFINE_HOOKED_METHOD(OverrideView, void, void *this_, CViewSetup *setup)
             freecam_origin += forward;
             setup->origin = freecam_origin;
         }
-        freecam_last = freecam.KeyDown();
+        freecam_last = freecam.isKeyDown();
     }
 
     draw::fov = setup->fov;

src/hooks/visual/PaintTraverse.cpp

@@ -4,13 +4,12 @@
 */
 
 #include <settings/Registered.hpp>
+#include <MiscTemporary.hpp>
 #include "HookedMethods.hpp"
 #include "hacks/Radar.hpp"
 
-static settings::Bool disable_visuals{ "visual.disable", "false" };
-static settings::Bool no_zoom{ "remove.scope", "false" };
 static settings::Bool pure_bypass{ "visual.sv-pure-bypass", "false" };
-static settings::Int software_cursor_move{ "visual.software-cursor-mode", "0" };
+static settings::Int software_cursor_mode{ "visual.software-cursor-mode", "0" };
 
 static settings::Int waittime{ "debug.join-wait-time", "2500" };
 static settings::Bool no_reportlimit{ "misc.no-report-limit", "false" };
@@ -230,13 +229,13 @@ label1:
         pure_orig  = (void *) 0;
     }
     call_default = true;
-    if (cathook && panel_scope && no_zoom && panel == panel_scope)
+    if (isHackActive() && panel_scope && no_zoom && panel == panel_scope)
         call_default = false;
 
     if (software_cursor_mode)
     {
         cur = software_cursor->GetBool();
-        switch ((int) software_cursor_mode)
+        switch (*software_cursor_mode)
         {
         case 1:
             if (!software_cursor->GetBool())
@@ -268,7 +267,7 @@ label1:
 
     if (panel == panel_top)
         draw_flag = true;
-    if (!cathook)
+    if (!isHackActive())
         return;
 
     if (!panel_top)
@@ -319,7 +318,7 @@ label1:
     if (clean_screenshots && g_IEngine->IsTakingScreenshot())
         return;
 #if ENABLE_GUI
-    g_pGUI->Update();
+    // FIXME
 #endif
     draw::UpdateWTS();
 }

src/hooks/visual/SDL_GL_SwapWindow.cpp

@@ -3,11 +3,11 @@
   Copyright (c) 2018 nullworks. All rights reserved.
 */
 
-#include <SDL2/SDL_syswm.h>
 #include <MiscTemporary.hpp>
 #include <visual/SDLHooks.hpp>
 #include <glez/draw.hpp>
 #include "HookedMethods.hpp"
+#include <SDL2/SDL_syswm.h>
 
 static bool init{ false };
 static bool init_wminfo{ false };
@@ -39,7 +39,7 @@ DEFINE_HOOKED_METHOD(SDL_GL_SwapWindow, void, SDL_Window *window)
     if (!tf2_sdl)
         tf2_sdl = SDL_GL_GetCurrentContext();
 
-    if (cathook && !disable_visuals)
+    if (isHackActive() && !disable_visuals)
     {
         PROF_SECTION(SWAPWINDOW_cathook);
         if (not init)

src/textmode.cpp

@@ -39,7 +39,7 @@ CatCommand fixvac("fixvac", "Lemme in to secure servers", []() {
     EXPOSED_Epic_VACBypass_1337_DoNotSteal_xXx_$1_xXx_MLG();
 });
 
-InitRoutine init([]() {
+static InitRoutine init([]() {
 #if ENABLE_TEXTMODE_STDIN
     logging::Info("[TEXTMODE] Setting up input handling");
     int flags = fcntl(0, F_GETFL, 0);

src/visual/EffectChams.cpp

@@ -163,8 +163,7 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity)
     switch (ent->m_Type())
     {
     case ENTITY_BUILDING:
-        if (!ent->m_bEnemy() && !(teammates || teammate_buildings) &&
+        if (!ent->m_bEnemy() && !(teammates || teammate_buildings) && ent != LOCAL_E)
-            (!(chamsR || chamsB || chamsG) && ent != LOCAL_E))
         {
             return colors::empty;
         }
@@ -176,13 +175,6 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity)
     case ENTITY_PLAYER:
         if (!players)
             return colors::empty;
-        if (ent->m_IDX == LOCAL_E->m_IDX && chamsteam)
-            if (LOCAL_E->m_iTeam() == TEAM_BLU)
-                return colors::blu;
-            else
-                return colors::red;
-        if (ent->m_IDX == LOCAL_E->m_IDX && !rainbow)
-            return colors::FromRGBA8(chamsR, chamsG, chamsB, 255);
         if (health)
         {
             return colors::Health(ent->m_iHealth(), ent->m_iMaxHealth());
@@ -238,11 +230,11 @@ bool EffectChams::ShouldRenderChams(IClientEntity *entity)
         case ITEM_HEALTH_LARGE:
         case ITEM_HEALTH_MEDIUM:
         case ITEM_HEALTH_SMALL:
-            return medkits;
+            return *medkits;
         case ITEM_AMMO_LARGE:
         case ITEM_AMMO_MEDIUM:
         case ITEM_AMMO_SMALL:
-            return ammobox;
+            return *ammobox;
         }
         break;
     }
@@ -325,7 +317,7 @@ void EffectChams::Render(int x, int y, int w, int h)
         return;
     if (!init)
         Init();
-    if (!cathook || (g_IEngine->IsTakingScreenshot() && clean_screenshots))
+    if (!isHackActive() || (g_IEngine->IsTakingScreenshot() && clean_screenshots))
         return;
     CMatRenderContextPtr ptr(GET_RENDER_CONTEXT);
     BeginRenderChams();

src/visual/EffectGlow.cpp

@@ -239,13 +239,11 @@ rgba_t EffectGlow::GlowColor(IClientEntity *entity)
         }
         break;
     case ENTITY_PLAYER:
-        if (ent->m_IDX == LOCAL_E->m_IDX && glowteam)
+        if (ent->m_IDX == LOCAL_E->m_IDX)
             if (LOCAL_E->m_iTeam() == TEAM_BLU)
                 return colors::blu;
             else
                 return colors::red;
-        if (ent->m_IDX == LOCAL_E->m_IDX && glowself && !rainbow)
-            return colors::FromRGBA8(glowR, glowG, glowB, 255);
         if (health && playerlist::IsDefault(ent))
         {
             return colors::Health(ent->m_iHealth(), ent->m_iMaxHealth());
@@ -296,11 +294,11 @@ bool EffectGlow::ShouldRenderGlow(IClientEntity *entity)
         const auto &type = ent->m_ItemType();
         if (type >= ITEM_HEALTH_SMALL && type <= ITEM_HEALTH_LARGE)
         {
-            return medkits;
+            return *medkits;
         }
         else if (type >= ITEM_AMMO_SMALL && type <= ITEM_AMMO_SMALL)
         {
-            return ammobox;
+            return *ammobox;
         }
         else if (type >= ITEM_POWERUP_FIRST && type <= ITEM_POWERUP_LAST)
         {
@@ -433,7 +431,7 @@ void EffectGlow::Render(int x, int y, int w, int h)
     static IMaterialVar *blury_bloomamount;
     if (!init)
         Init();
-    if (!cathook || (g_IEngine->IsTakingScreenshot() && clean_screenshots) ||
+    if (!isHackActive() || (g_IEngine->IsTakingScreenshot() && clean_screenshots) ||
         g_Settings.bInvalid)
         return;
     CMatRenderContextPtr ptr(GET_RENDER_CONTEXT);

src/visual/EventLogging.cpp

@@ -168,7 +168,7 @@ public:
     }
 };
 
-LoggingEventListener listener{};
+static LoggingEventListener listener{};
 
 InitRoutine init([]() {
     g_IGameEventManager->AddListener(&listener, false);

src/visual/drawmgr.cpp

@@ -84,7 +84,8 @@ void DrawCheatVisuals()
 #endif
                         )
                 {
-                    name_s = force_name.GetString();
+                    // FIXME
+                    /*name_s = *force_name;
                     if (name_s.length() < 3)
                         name_s = "*Not Set*";
                     reason_s   = disconnect_reason.GetString();
@@ -94,12 +95,11 @@ void DrawCheatVisuals()
                     AddSideString(format("Custom Name: ", name_s), GUIColor());
                     AddSideString(
                         format("Custom Disconnect Reason: ", reason_s),
-                        GUIColor());
+                        GUIColor());*/
                 }
             }
         }
     }
-    hacks::tf2::global::runcfg();
     if (spectator_target)
     {
         AddCenterString("Press SPACE to stop spectating");
@@ -111,10 +111,6 @@ void DrawCheatVisuals()
             PROF_SECTION(DRAW_aimbot);
             hacks::shared::aimbot::DrawText();
         }
-        {
-            PROF_SECTION(DRAW_lagexploit)
-            hacks::shared::lagexploit::Draw();
-        }
         IF_GAME(IsTF2())
         {
             PROF_SECTION(DRAW_skinchanger);
@@ -142,11 +138,6 @@ void DrawCheatVisuals()
             PROF_SECTION(DRAW_lightesp);
             hacks::shared::lightesp::draw();
         }
-        IF_GAME(IsTF2())
-        {
-            PROF_SECTION(DRAW_healarrows);
-            hacks::tf2::healarrow::Draw();
-        }
         {
             PROF_SECTION(DRAW_walkbot);
             hacks::shared::walkbot::Draw();

src/visual/fidgetspinner.cpp

@@ -50,7 +50,7 @@ public:
     }
 };
 
-SpinnerListener listener;
+static SpinnerListener listener;
 
 void InitSpinner()
 {