Merge pull request #468 from TotallyNotElite/master

Display friend glow over health glow and add option to disable auto-rage and antiaim check

include/hacks/AntiCheat.hpp

@@ -17,10 +17,10 @@ namespace hacks::shared::anticheat
 {
 
 void Accuse(int eid, const std::string &hack, const std::string &details);
-
+static CatVar autorage(CV_SWITCH, "ac_autorage", "0", "Auto Rage");
 void Init();
 void CreateMove();
 
 void ResetPlayer(int index);
 void ResetEverything();
-}
+}

src/hacks/AntiCheat.cpp

@@ -20,6 +20,7 @@ namespace anticheat
 
 static CatVar enabled(CV_SWITCH, "ac_enabled", "0", "Enable AC");
 static CatVar accuse_chat(CV_SWITCH, "ac_chat", "0", "Accuse in chat");
+static CatVar autorage(CV_SWITCH, "ac_autorage", "0", "Auto Rage");
 
 void Accuse(int eid, const std::string &hack, const std::string &details)
 {

src/hacks/ac/aimbot.cpp

@@ -63,7 +63,7 @@ void Update(CachedEntity *player)
                 // deviation, data.detections);
                 player_info_t info;
                 g_IEngine->GetPlayerInfo(player->m_IDX, &info);
-                if (am > 5)
+                if (am > 5 && hacks::shared::anticheat::autorage)
                 {
                     playerlist::AccessData(info.friendsID).state =
                         playerlist::k_EState::RAGE;

src/hacks/ac/antiaim.cpp

@@ -12,7 +12,7 @@ namespace ac
 {
 namespace antiaim
 {
-
+static CatVar enabled(CV_SWITCH, "ac_antiaim", "1", "Detect Antiaim");
 unsigned long last_accusation[32]{ 0 };
 
 void ResetEverything()
@@ -32,6 +32,8 @@ void Init()
 
 void Update(CachedEntity *player)
 {
+    if (!enabled)
+        return;
     int amount[32];
     auto &am = amount[player->m_IDX - 1];
     if (tickcount - last_accusation[player->m_IDX - 1] < 60 * 60)
@@ -48,7 +50,7 @@ void Update(CachedEntity *player)
             am++;
             player_info_t info;
             g_IEngine->GetPlayerInfo(player->m_IDX, &info);
-            if (am > 5)
+            if (am > 5 && hacks::shared::anticheat::autorage)
             {
                 playerlist::AccessData(info.friendsID).state =
                     playerlist::k_EState::RAGE;

src/visual/EffectGlow.cpp

@@ -260,7 +260,7 @@ rgba_t EffectGlow::GlowColor(IClientEntity *entity)
                 return colors::red;
         if (ent->m_IDX == LOCAL_E->m_IDX && glowself && !rainbow)
             return colors::FromRGBA8(glowR, glowG, glowB, 255);
-        if (health)
+        if (health && playerlist::IsDefault(ent))
         {
             return colors::Health(ent->m_iHealth(), ent->m_iMaxHealth());
         }

src/visual/menu/ncc/Menu.cpp

@@ -733,6 +733,8 @@ static const std::string list_tf2 = R"(
 				"ac_aimbot"
 				"ac_aimbot_detections"
 				"ac_aimbot_angle"
+				"ac_antiaim"
+				"ac_autorage"
 				"ac_bhop_count"
 				"ac_ignore_local"
 				"ac_chat"