From 3778e66ecd23f01f7a590767b810a2d40ba46eba Mon Sep 17 00:00:00 2001 From: nullifiedcat Date: Sat, 28 Jul 2018 22:50:51 +0300 Subject: [PATCH] remove CatVar from headers --- include/MiscTemporary.hpp | 20 ++------------------ include/backpacktf.hpp | 2 -- include/core/cvwrapper.hpp | 2 +- include/globals.h | 10 ---------- include/hacks/AntiAim.hpp | 1 - include/hacks/AutoJoin.hpp | 3 --- include/hacks/AutoTaunt.hpp | 4 ---- include/hacks/Backtrack.hpp | 2 -- include/hacks/FollowBot.hpp | 2 -- include/hacks/Trigger.hpp | 2 -- include/hitrate.hpp | 1 - include/ipc.hpp | 8 -------- include/tfmm.hpp | 2 -- include/visual/drawing.hpp | 1 - include/visual/fidgetspinner.hpp | 3 --- src/visual/EffectGlow.cpp | 9 +++------ 16 files changed, 6 insertions(+), 66 deletions(-) diff --git a/include/MiscTemporary.hpp b/include/MiscTemporary.hpp index 3102ea90..a404aae4 100644 --- a/include/MiscTemporary.hpp +++ b/include/MiscTemporary.hpp @@ -11,26 +11,10 @@ extern bool *bSendPackets; extern std::array bruteint; extern std::array timers; -extern CatVar no_zoom; -extern CatVar clean_screenshots; -extern CatVar disable_visuals; -extern CatVar disconnect_reason; -extern CatVar crypt_chat; -extern CatVar minigun_jump; -extern CatVar nolerp; -extern CatVar joinclass; -extern CatVar jointeam; -extern CatVar fakelag_amount; -extern CatVar serverlag_amount; -extern CatVar servercrash; -extern CatVar debug_projectiles; -extern CatVar semiauto; -extern CatVar resolver; -extern CatVar engine_pred; + extern Timer DelayTimer; extern bool firstcm; -extern CatVar delay; -extern CatVar adjust; + extern float prevflow; extern int prevflowticks; #if ENABLE_VISUALS diff --git a/include/backpacktf.hpp b/include/backpacktf.hpp index 487d5af5..4b64c931 100755 --- a/include/backpacktf.hpp +++ b/include/backpacktf.hpp @@ -7,8 +7,6 @@ #pragma once -class CatVar; - namespace backpacktf { diff --git a/include/core/cvwrapper.hpp b/include/core/cvwrapper.hpp index 44623b87..2fde1e9f 100644 --- a/include/core/cvwrapper.hpp +++ b/include/core/cvwrapper.hpp @@ -38,4 +38,4 @@ public: std::vector &commandRegistrationArray(); -void RegisterCatVars(); +void RegisterCatCommands(); diff --git a/include/globals.h b/include/globals.h index 033c5f31..5120689c 100644 --- a/include/globals.h +++ b/include/globals.h @@ -10,7 +10,6 @@ #include class Vector; class ConVar; -class CatVar; extern int g_AppID; extern unsigned long tickcount; @@ -20,21 +19,12 @@ extern ConVar *cl_interp_ratio; extern ConVar *cl_interp; extern ConVar *cl_interpolate; -extern CatVar event_log; -extern CatVar cathook; // Master switch extern bool *bSendPackets; -extern CatVar show_antiaim; -extern CatVar force_thirdperson; -extern CatVar console_logging; -extern CatVar fast_outline; -extern CatVar roll_speedhack; -extern CatVar force_name; extern char *force_name_newlined; extern bool need_name_change; extern int last_cmd_number; extern char *disconnect_reason_newlined; -extern CatVar disconnect_reason; extern time_t time_injected; struct brutestruct diff --git a/include/hacks/AntiAim.hpp b/include/hacks/AntiAim.hpp index 835a7fef..3c544b2c 100755 --- a/include/hacks/AntiAim.hpp +++ b/include/hacks/AntiAim.hpp @@ -7,7 +7,6 @@ #pragma once -class CatVar; class CUserCmd; namespace hacks::shared::antiaim diff --git a/include/hacks/AutoJoin.hpp b/include/hacks/AutoJoin.hpp index 4476e6df..64dc5095 100755 --- a/include/hacks/AutoJoin.hpp +++ b/include/hacks/AutoJoin.hpp @@ -10,9 +10,6 @@ namespace hacks::shared::autojoin { -extern CatVar auto_queue; -extern Timer queuetime; - void Update(); void UpdateSearch(); } diff --git a/include/hacks/AutoTaunt.hpp b/include/hacks/AutoTaunt.hpp index 1f0a4610..8159110e 100755 --- a/include/hacks/AutoTaunt.hpp +++ b/include/hacks/AutoTaunt.hpp @@ -7,10 +7,6 @@ #pragma once -class CatVar; -class InitRoutine; - namespace hacks::tf::autotaunt { -extern InitRoutine init; } diff --git a/include/hacks/Backtrack.hpp b/include/hacks/Backtrack.hpp index 6ae0667d..5d47972f 100644 --- a/include/hacks/Backtrack.hpp +++ b/include/hacks/Backtrack.hpp @@ -54,8 +54,6 @@ struct CIncomingSequence }; typedef boost::circular_buffer_space_optimized circular_buf; extern circular_buf sequences; -extern CatVar latency; -extern CatVar enable; extern int ticks; extern BacktrackData headPositions[32][66]; extern BestTickData sorted_ticks[66]; diff --git a/include/hacks/FollowBot.hpp b/include/hacks/FollowBot.hpp index 3781a6c3..263f23ad 100644 --- a/include/hacks/FollowBot.hpp +++ b/include/hacks/FollowBot.hpp @@ -13,8 +13,6 @@ namespace hacks::shared::followbot // Followed entity, externed for highlight color extern int follow_target; extern bool followcart; -extern CatVar followbot; -extern CatVar roambot; extern CatCommand follow_steam; extern unsigned steamid; void DrawTick(); diff --git a/include/hacks/Trigger.hpp b/include/hacks/Trigger.hpp index 1f5a74aa..6059a9c9 100755 --- a/include/hacks/Trigger.hpp +++ b/include/hacks/Trigger.hpp @@ -9,8 +9,6 @@ #include "common.hpp" -class CatVar; - namespace hacks::shared::triggerbot { diff --git a/include/hitrate.hpp b/include/hitrate.hpp index d51123f5..351b3e9c 100755 --- a/include/hitrate.hpp +++ b/include/hitrate.hpp @@ -13,7 +13,6 @@ namespace hitrate extern int count_shots; extern int count_hits; extern int count_hits_head; -extern CatVar hitrate_check; void Update(); } diff --git a/include/ipc.hpp b/include/ipc.hpp index dccc6414..2d62244f 100755 --- a/include/ipc.hpp +++ b/include/ipc.hpp @@ -16,7 +16,6 @@ #include class CatCommand; -class CatVar; namespace ipc { @@ -32,13 +31,6 @@ constexpr unsigned stop_moving = 5; constexpr unsigned start_moving = 6; } -extern CatCommand connect; -extern CatCommand disconnect; -extern CatCommand exec; -extern CatCommand exec_all; -extern CatCommand lobby; -extern CatVar server_name; - constexpr unsigned cathook_magic_number = 0x0DEADCA7; struct server_data_s diff --git a/include/tfmm.hpp b/include/tfmm.hpp index 12d2c724..b786a79b 100755 --- a/include/tfmm.hpp +++ b/include/tfmm.hpp @@ -14,6 +14,4 @@ void queue_start(); void queue_leave(); void dcandabandon(); void abandon(); -extern CatVar queue; -extern CatEnum queue_mode; } diff --git a/include/visual/drawing.hpp b/include/visual/drawing.hpp index 55cde476..94a06ad5 100644 --- a/include/visual/drawing.hpp +++ b/include/visual/drawing.hpp @@ -12,7 +12,6 @@ class CachedEntity; class Vector; -class CatVar; class IClientEntity; class CatEnum; class VMatrix; diff --git a/include/visual/fidgetspinner.hpp b/include/visual/fidgetspinner.hpp index ad5f588f..dbb81b9a 100755 --- a/include/visual/fidgetspinner.hpp +++ b/include/visual/fidgetspinner.hpp @@ -10,9 +10,6 @@ #include #include "common.hpp" -class CatVar; - extern std::array spinner_states; -extern CatVar v9mode; void InitSpinner(); void DrawSpinner(); diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp index 5fad7caa..e7c3d972 100644 --- a/src/visual/EffectGlow.cpp +++ b/src/visual/EffectGlow.cpp @@ -24,6 +24,9 @@ static settings::Bool show_powerups{ "glow.show.powerups", "true" }; static settings::Bool weapons_white{ "glow.white-weapons", "true" }; static settings::Bool glowself{ "glow.self", "true" }; static settings::Bool rainbow{ "glow.self-rainbow", "true" }; +static settings::Int blur_scale{ "glow.blur-scale", "5" }; +// https://puu.sh/vobH4/5da8367aef.png +static settings::Int solid_when{ "glow.solid-when", "0" }; IMaterialSystem *materials = nullptr; @@ -331,12 +334,6 @@ void EffectGlow::EndRenderGlow() ptr->PopRenderTargetAndViewport(); } -// https://puu.sh/vobH4/5da8367aef.png -static CatEnum solid_when_enum({ "Never", "Always", "Invisible" }); -static CatVar blur_scale(CV_INT, "glow_blur_scale", "5", "Blur amount", - "Ammount to blur the glow"); -static CatVar solid_when(solid_when_enum, "glow_solid_when", "0", "Solid when", - "Glow will be solid when entity is..."); void EffectGlow::StartStenciling() {