diff --git a/include/hacks/AntiCheat.hpp b/include/hacks/AntiCheat.hpp index e6e49655..a992e49f 100755 --- a/include/hacks/AntiCheat.hpp +++ b/include/hacks/AntiCheat.hpp @@ -15,12 +15,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 SetRage(player_info_t info); void ResetPlayer(int index); void ResetEverything(); } diff --git a/src/hacks/AntiCheat.cpp b/src/hacks/AntiCheat.cpp index 057bacae..65fb92c2 100755 --- a/src/hacks/AntiCheat.cpp +++ b/src/hacks/AntiCheat.cpp @@ -17,7 +17,6 @@ namespace shared { 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"); @@ -47,6 +46,12 @@ void Accuse(int eid, const std::string &hack, const std::string &details) static CatVar skip_local(CV_SWITCH, "ac_ignore_local", "1", "Ignore Local"); +void SetRage(player_info_t info) +{ + if (autorage) + playerlist::AccessData(info.friendsID).state = playerlist::k_EState::RAGE; +} + void CreateMove() { if (!enabled) diff --git a/src/hacks/ac/aimbot.cpp b/src/hacks/ac/aimbot.cpp index ddad0e16..2201dcf8 100644 --- a/src/hacks/ac/aimbot.cpp +++ b/src/hacks/ac/aimbot.cpp @@ -63,10 +63,9 @@ void Update(CachedEntity *player) // deviation, data.detections); player_info_t info; g_IEngine->GetPlayerInfo(player->m_IDX, &info); - if (am > 5 && hacks::shared::anticheat::autorage) + if (am > 5) { - playerlist::AccessData(info.friendsID).state = - playerlist::k_EState::RAGE; + hacks::shared::anticheat::SetRage(info); am = 0; } if (++data.detections > int(detections_warning)) diff --git a/src/hacks/ac/antiaim.cpp b/src/hacks/ac/antiaim.cpp index 905fdfe4..d0a8282c 100755 --- a/src/hacks/ac/antiaim.cpp +++ b/src/hacks/ac/antiaim.cpp @@ -50,10 +50,9 @@ void Update(CachedEntity *player) am++; player_info_t info; g_IEngine->GetPlayerInfo(player->m_IDX, &info); - if (am > 5 && hacks::shared::anticheat::autorage) + if (am > 5) { - playerlist::AccessData(info.friendsID).state = - playerlist::k_EState::RAGE; + hacks::shared::anticheat::SetRage(info); am = 0; } std::string reason = diff --git a/src/helpers.cpp b/src/helpers.cpp index d0af3f05..db53bcd6 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -1021,13 +1021,13 @@ void PrintChat(const char *fmt, ...) CHudBaseChat *chat = (CHudBaseChat *) g_CHUD->FindElement("CHudChat"); if (chat) { - char *buf = new char[1024]; + std::unique_ptr buf (new char[1024]); va_list list; va_start(list, fmt); - vsprintf(buf, fmt, list); + vsprintf(buf.get(), fmt, list); va_end(list); std::unique_ptr str(strfmt("\x07%06X[\x07%06XCAT\x07%06X]\x01 %s", - 0x5e3252, 0xba3d9a, 0x5e3252, buf)); + 0x5e3252, 0xba3d9a, 0x5e3252, buf.get())); // FIXME DEBUG LOG logging::Info("%s", str.get()); chat->Printf(str.get()); diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp index a3c93648..3b9a3ee4 100644 --- a/src/visual/EffectGlow.cpp +++ b/src/visual/EffectGlow.cpp @@ -140,7 +140,7 @@ ITexture *GetBuffer(int i) IMAGE_FORMAT_RGBA8888, MATERIAL_RT_DEPTH_SEPARATE, textureFlags, renderTargetFlags); } - + delete newname; buffers[i].Init(texture); } return buffers[i];