From af0520494c7e31acf63d535802e73fdc2c66d25e Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Tue, 1 May 2018 17:20:08 +0200 Subject: [PATCH 1/2] clang --- src/MiscTemporary.cpp | 2 +- src/backpacktf.cpp | 7 +- src/chatlog.cpp | 7 +- src/crits.cpp | 2 +- src/hacks/Achievement.cpp | 2 +- src/hacks/AntiAim.cpp | 57 +++++++------ src/hacks/AntiDisguise.cpp | 2 +- src/hacks/AutoDeadringer.cpp | 5 +- src/hacks/AutoDetonator.cpp | 7 +- src/hacks/AutoHeal.cpp | 4 +- src/hacks/AutoJoin.cpp | 12 +-- src/hacks/AutoReflect.cpp | 36 ++++---- src/hacks/AutoSticky.cpp | 6 +- src/hacks/AutoTaunt.cpp | 2 +- src/hacks/Bunnyhop.cpp | 7 +- src/hacks/ESP.cpp | 131 ++++++++++++++++------------- src/hacks/FollowBot.cpp | 10 +-- src/hacks/Killstreak.cpp | 2 +- src/hacks/LagExploit.cpp | 50 ++++++----- src/hacks/Misc.cpp | 40 +++++---- src/hacks/Radar.cpp | 25 +++--- src/hacks/Spam.cpp | 14 +-- src/hacks/SpyAlert.cpp | 14 +-- src/hacks/Walkbot.cpp | 16 ++-- src/hooks/GetFriendPersonaName.cpp | 11 +-- src/hooks/LevelInit.cpp | 60 ++++++------- src/hooks/visual/OverrideView.cpp | 9 +- src/hooks/visual/PaintTraverse.cpp | 4 +- src/prediction.cpp | 4 +- src/visual/EffectChams.cpp | 3 +- src/visual/EffectGlow.cpp | 3 +- src/visual/colors.cpp | 15 ++-- src/visual/drawmgr.cpp | 6 +- src/visual/fidgetspinner.cpp | 13 +-- src/visual/menu/ncc/Menu.cpp | 9 +- 35 files changed, 323 insertions(+), 274 deletions(-) mode change 100755 => 100644 src/backpacktf.cpp mode change 100755 => 100644 src/hacks/AntiDisguise.cpp mode change 100755 => 100644 src/hacks/AutoDetonator.cpp mode change 100755 => 100644 src/hacks/AutoReflect.cpp mode change 100755 => 100644 src/hacks/AutoTaunt.cpp mode change 100755 => 100644 src/hacks/Bunnyhop.cpp mode change 100755 => 100644 src/hacks/Radar.cpp mode change 100755 => 100644 src/hacks/Spam.cpp mode change 100755 => 100644 src/hacks/SpyAlert.cpp mode change 100755 => 100644 src/prediction.cpp mode change 100755 => 100644 src/visual/EffectGlow.cpp mode change 100755 => 100644 src/visual/colors.cpp diff --git a/src/MiscTemporary.cpp b/src/MiscTemporary.cpp index aae41db3..55c9d16f 100644 --- a/src/MiscTemporary.cpp +++ b/src/MiscTemporary.cpp @@ -25,7 +25,7 @@ CatVar serverlag_amount( "Lag the server by spamming this many voicecommands per tick"); CatVar semiauto(CV_INT, "semiauto", "0", "Semiauto"); static CatVar servercrash(CV_SWITCH, "servercrash", "0", "crash servers", - "Crash servers by spamming signon net messages"); + "Crash servers by spamming signon net messages"); bool *bSendPackets; CatVar crypt_chat( diff --git a/src/backpacktf.cpp b/src/backpacktf.cpp old mode 100755 new mode 100644 index d55015e6..96c1c753 --- a/src/backpacktf.cpp +++ b/src/backpacktf.cpp @@ -25,9 +25,10 @@ std::mutex cache_mutex{}; std::string api_key_s = ""; bool valid_api_key = false; -static CatVar enable_bptf(CV_SWITCH, "bptf_enable", "0", "Enable backpack.tf", - "Enable backpack.tf integration\nYou have to set your API " - "key in cat_bptf_key"); +static CatVar + enable_bptf(CV_SWITCH, "bptf_enable", "0", "Enable backpack.tf", + "Enable backpack.tf integration\nYou have to set your API " + "key in cat_bptf_key"); CatCommand api_key("bptf_key", "Set API Key", [](const CCommand &args) { api_key_s = args.ArgS(); logging::Info("API key changed!"); diff --git a/src/chatlog.cpp b/src/chatlog.cpp index 33805f83..fb356b4f 100644 --- a/src/chatlog.cpp +++ b/src/chatlog.cpp @@ -15,11 +15,12 @@ namespace chatlog { -static CatVar enabled(CV_SWITCH, "chat_log", "0", "Chat log", "Log chat to file"); +static CatVar enabled(CV_SWITCH, "chat_log", "0", "Chat log", + "Log chat to file"); static CatVar dont_log_spam(CV_SWITCH, "chat_log_nospam", "1", "No Spam", - "Don't log your messages if spam is active"); + "Don't log your messages if spam is active"); static CatVar dont_log_ipc(CV_SWITCH, "chat_log_noipc", "1", "No IPC", - "Don't log messages sent by bots"); + "Don't log messages sent by bots"); class csv_stream { diff --git a/src/crits.cpp b/src/crits.cpp index a2c5454b..54ee3829 100644 --- a/src/crits.cpp +++ b/src/crits.cpp @@ -14,7 +14,7 @@ static CatVar crit_legiter( CV_SWITCH, "crit_force_gameplay", "0", "Don't hinder gameplay", "Attempt to crit when possible but do not hinder normal gameplay"); static CatVar crit_experimental(CV_SWITCH, "crit_experimental", "0", - "Experimental crithack"); + "Experimental crithack"); std::unordered_map command_number_mod{}; diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp index d07e54d7..11545eb4 100644 --- a/src/hacks/Achievement.cpp +++ b/src/hacks/Achievement.cpp @@ -11,7 +11,7 @@ namespace hacks::tf2::achievement { static CatVar safety(CV_SWITCH, "achievement_safety", "1", - "Achievement commands safety switch"); + "Achievement commands safety switch"); void Lock() { diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp index a901fd1f..d05a50cb 100644 --- a/src/hacks/AntiAim.cpp +++ b/src/hacks/AntiAim.cpp @@ -20,48 +20,51 @@ CatVar communicate(CV_SWITCH, "identify", "1", "identify", CatVar enabled(CV_SWITCH, "aa_enabled", "0", "Anti-Aim", "Master AntiAim switch"); static CatVar trueang(CV_SWITCH, "aa_realfakes", "0", "Real fakes", - "Do real fakeangles (Unresolveable)"); -static CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", 360.0); -static CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", "Static pitch (up/down)", - -89.0, 89.0); + "Do real fakeangles (Unresolveable)"); +static CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", + 360.0); +static CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", + "Static pitch (up/down)", -89.0, 89.0); static CatVar yaw_real(CV_FLOAT, "aa_yaw_real", "0.0", "Real Yaw", - "Static yaw (left/right)", 360.0); + "Static yaw (left/right)", 360.0); static CatVar pitch_real(CV_FLOAT, "aa_pitch_real", "-89.0", "Real Pitch", - "Static pitch (up/down)", -89.0, 89.0); -static CatEnum yaw_mode_enum({ "KEEP", "STATIC", "JITTER", "BIGRANDOM", "RANDOM", - "SPIN", "OFFSETKEEP", "EDGE", "HECK", "FAKESIDEWAYS" }); + "Static pitch (up/down)", -89.0, 89.0); +static CatEnum yaw_mode_enum({ "KEEP", "STATIC", "JITTER", "BIGRANDOM", + "RANDOM", "SPIN", "OFFSETKEEP", "EDGE", "HECK", + "FAKESIDEWAYS" }); static CatEnum pitch_mode_enum({ "KEEP", "STATIC", "JITTER", "RANDOM", "FLIP", - "FAKEFLIP", "FAKEUP", "FAKEDOWN", "FAKECENTER", "UP", - "DOWN", "HECK" }); + "FAKEFLIP", "FAKEUP", "FAKEDOWN", "FAKECENTER", + "UP", "DOWN", "HECK" }); CatVar yaw_mode(yaw_mode_enum, "aa_yaw_mode", "0", "Yaw mode", "Yaw mode"); static CatVar pitch_mode(pitch_mode_enum, "aa_pitch_mode", "0", "Pitch mode", - "Pitch mode"); -static CatVar true_yaw_mode(yaw_mode_enum, "aa_yaw_mode_real", "0", "The Real Yaw", - "Yaw mode"); + "Pitch mode"); +static CatVar true_yaw_mode(yaw_mode_enum, "aa_yaw_mode_real", "0", + "The Real Yaw", "Yaw mode"); static CatVar true_pitch_mode(pitch_mode_enum, "aa_pitch_mode_real", "0", - "The Real Pitch", "Pitch mode"); -static CatVar roll(CV_FLOAT, "aa_roll", "0", "Roll", "Roll angle (viewangles.z)", -180, - 180); -static CatVar no_clamping(CV_SWITCH, "aa_no_clamp", "0", "Don't clamp angles", - "Use this with STATIC mode for unclamped manual angles"); + "The Real Pitch", "Pitch mode"); +static CatVar roll(CV_FLOAT, "aa_roll", "0", "Roll", + "Roll angle (viewangles.z)", -180, 180); +static CatVar + no_clamping(CV_SWITCH, "aa_no_clamp", "0", "Don't clamp angles", + "Use this with STATIC mode for unclamped manual angles"); static CatVar spin(CV_FLOAT, "aa_spin", "10.0", "Spin speed", - "Spin speed (degrees/second)"); + "Spin speed (degrees/second)"); static CatVar aaaa_enabled(CV_SWITCH, "aa_aaaa_enabled", "0", "Enable AAAA", - "Enable Anti-Anti-Anti-Aim (Overrides AA Pitch)"); + "Enable Anti-Anti-Anti-Aim (Overrides AA Pitch)"); static CatVar aaaa_interval(CV_FLOAT, "aa_aaaa_interval", "0", "Interval", - "Interval in seconds, 0 = random"); + "Interval in seconds, 0 = random"); static CatVar aaaa_interval_random_high(CV_FLOAT, "aa_aaaa_interval_high", "15", - "Interval Ceiling", - "Upper bound for random AAAA interval"); + "Interval Ceiling", + "Upper bound for random AAAA interval"); static CatVar aaaa_interval_random_low(CV_FLOAT, "aa_aaaa_interval_low", "3", - "Interval Floor", - "Lower bound for random AAAA interval"); + "Interval Floor", + "Lower bound for random AAAA interval"); static CatEnum aaaa_modes_enum({ "(FAKE)UP", "(FAKE)DOWN" }); static CatVar aaaa_mode(aaaa_modes_enum, "aa_aaaa_mode", "0", "Mode", - "Anti-Anti-Anti-Aim Mode"); + "Anti-Anti-Anti-Aim Mode"); static CatVar aaaa_flip_key(CV_KEY, "aa_aaaa_flip_key", "0", "Flip key", - "If you press that key, current AA will change"); + "If you press that key, current AA will change"); float cur_yaw = 0.0f; int safe_space = 0; diff --git a/src/hacks/AntiDisguise.cpp b/src/hacks/AntiDisguise.cpp old mode 100755 new mode 100644 index 2e83276e..e6763ea1 --- a/src/hacks/AntiDisguise.cpp +++ b/src/hacks/AntiDisguise.cpp @@ -15,7 +15,7 @@ namespace antidisguise { static CatVar enabled(CV_SWITCH, "antidisguise", "0", "Remove spy disguise", - "Removes the disguise from spys\nUsefull for aimbot"); + "Removes the disguise from spys\nUsefull for aimbot"); static CatVar no_invisibility(CV_SWITCH, "no_invis", "0", "Remove Invisibility", "Useful with chams!"); diff --git a/src/hacks/AutoDeadringer.cpp b/src/hacks/AutoDeadringer.cpp index 27d80b68..cf76a43d 100644 --- a/src/hacks/AutoDeadringer.cpp +++ b/src/hacks/AutoDeadringer.cpp @@ -11,8 +11,9 @@ namespace shared { namespace deadringer { -static CatVar enabled(CV_SWITCH, "deadringer_auto", "0", "Auto deadringer", - "automatically pull out DR on low health or projectile nearby"); +static CatVar + enabled(CV_SWITCH, "deadringer_auto", "0", "Auto deadringer", + "automatically pull out DR on low health or projectile nearby"); bool IsProjectile(CachedEntity *ent) { diff --git a/src/hacks/AutoDetonator.cpp b/src/hacks/AutoDetonator.cpp old mode 100755 new mode 100644 index 6daabd10..9f27bae3 --- a/src/hacks/AutoDetonator.cpp +++ b/src/hacks/AutoDetonator.cpp @@ -15,10 +15,11 @@ namespace autodetonator { // Vars for user settings -static CatVar enabled(CV_SWITCH, "detonator_enabled", "0", "Auto-Detonator-detonator", - "Master auto detonator switch"); +static CatVar enabled(CV_SWITCH, "detonator_enabled", "0", + "Auto-Detonator-detonator", + "Master auto detonator switch"); static CatVar legit(CV_SWITCH, "detonator_legit", "0", "Ignore invis", - "Ignores invis spies"); + "Ignores invis spies"); // A storage array for ents std::vector flares; diff --git a/src/hacks/AutoHeal.cpp b/src/hacks/AutoHeal.cpp index b0bcf857..2b5f22de 100644 --- a/src/hacks/AutoHeal.cpp +++ b/src/hacks/AutoHeal.cpp @@ -17,9 +17,9 @@ namespace autoheal { static CatVar enabled(CV_SWITCH, "autoheal_enabled", "0", "AutoHeal", - "Automatically heals nearby teammates"); + "Automatically heals nearby teammates"); static CatVar silent(CV_SWITCH, "autoheal_silent", "1", "Silent AutoHeal", - "Silent AutoHeal. Disable this to make ghetto followbot"); + "Silent AutoHeal. Disable this to make ghetto followbot"); // extern CatVar target_only; int m_iCurrentHealingTarget{ -1 }; diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp index 7f8fbdfd..8f77da81 100644 --- a/src/hacks/AutoJoin.cpp +++ b/src/hacks/AutoJoin.cpp @@ -19,12 +19,14 @@ namespace autojoin * Credits to Blackfire for helping me with auto-requeue! */ -static CatEnum classes_enum({ "DISABLED", "SCOUT", "SNIPER", "SOLDIER", "DEMOMAN", - "MEDIC", "HEAVY", "PYRO", "SPY", "ENGINEER" }); +static CatEnum classes_enum({ "DISABLED", "SCOUT", "SNIPER", "SOLDIER", + "DEMOMAN", "MEDIC", "HEAVY", "PYRO", "SPY", + "ENGINEER" }); static CatVar autojoin_team(CV_SWITCH, "autojoin_team", "0", "AutoJoin", - "Automatically joins a team"); -static CatVar preferred_class(classes_enum, "autojoin_class", "0", "AutoJoin class", - "You will pick a class automatically"); + "Automatically joins a team"); +static CatVar preferred_class(classes_enum, "autojoin_class", "0", + "AutoJoin class", + "You will pick a class automatically"); CatVar auto_queue(CV_SWITCH, "autoqueue", "0", "AutoQueue", "Automatically queue in casual matches"); diff --git a/src/hacks/AutoReflect.cpp b/src/hacks/AutoReflect.cpp old mode 100755 new mode 100644 index 73b8a751..4b95b5f3 --- a/src/hacks/AutoReflect.cpp +++ b/src/hacks/AutoReflect.cpp @@ -17,27 +17,31 @@ namespace autoreflect // Vars for user settings static CatVar enabled(CV_SWITCH, "reflect_enabled", "0", "Auto Reflect", - "Master AutoReflect switch"); -static CatVar idle_only(CV_SWITCH, "reflect_only_idle", "0", "Only when not shooting", - "Don't AutoReflect if you're holding M1"); -static CatVar legit(CV_SWITCH, "reflect_legit", "0", "Legit Reflect", - "Only Auto-airblasts projectiles that you can see, doesnt move " - "your crosshair"); + "Master AutoReflect switch"); +static CatVar idle_only(CV_SWITCH, "reflect_only_idle", "0", + "Only when not shooting", + "Don't AutoReflect if you're holding M1"); +static CatVar + legit(CV_SWITCH, "reflect_legit", "0", "Legit Reflect", + "Only Auto-airblasts projectiles that you can see, doesnt move " + "your crosshair"); static CatVar dodgeball(CV_SWITCH, "reflect_dodgeball", "0", "Dodgeball Mode", - "Allows auto-reflect to work in dodgeball servers"); + "Allows auto-reflect to work in dodgeball servers"); static CatVar blastkey(CV_KEY, "reflect_key", "0", "Reflect Key", - "Hold this key to activate auto-airblast"); -static CatVar stickies(CV_SWITCH, "reflect_stickybombs", "0", "Reflect stickies", - "Reflect Stickybombs"); + "Hold this key to activate auto-airblast"); +static CatVar stickies(CV_SWITCH, "reflect_stickybombs", "0", + "Reflect stickies", "Reflect Stickybombs"); static CatVar teammates(CV_SWITCH, "reflect_teammates", "0", - "Reflect teammates projectiles", "Useful in dodgeball with " - "free-for-all enabled"); -static CatVar fov(CV_FLOAT, "reflect_fov", "85", "Reflect FOV", "Reflect FOV", 180.0f); + "Reflect teammates projectiles", + "Useful in dodgeball with " + "free-for-all enabled"); +static CatVar fov(CV_FLOAT, "reflect_fov", "85", "Reflect FOV", "Reflect FOV", + 180.0f); static CatVar fov_draw(CV_SWITCH, "reflect_fov_draw", "0", "Draw Fov Ring", - "Draws a ring to represent your current reflect fov"); + "Draws a ring to represent your current reflect fov"); static CatVar fovcircle_opacity(CV_FLOAT, "reflect_fov_draw_opacity", "0.7", - "FOV Circle Opacity", "Defines opacity of FOV circle", - 0.0f, 1.0f); + "FOV Circle Opacity", + "Defines opacity of FOV circle", 0.0f, 1.0f); // TODO setup proj sorting // TODO CatVar big_proj(CV_SWITCH, "reflect_big_projectile", "0", "Reflect big // projectiles", "Reflect Rockets"); diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp index 269348de..95f3fa6a 100644 --- a/src/hacks/AutoSticky.cpp +++ b/src/hacks/AutoSticky.cpp @@ -17,9 +17,9 @@ namespace autosticky // Vars for user settings static CatVar enabled(CV_SWITCH, "sticky_enabled", "0", "AutoSticky", - "Master AutoSticky switch"); -static CatVar buildings(CV_SWITCH, "sticky_buildings", "1", "Detonate buildings", - "Stickies react to buildings"); + "Master AutoSticky switch"); +static CatVar buildings(CV_SWITCH, "sticky_buildings", "1", + "Detonate buildings", "Stickies react to buildings"); static CatVar legit(CV_SWITCH, "sticky_legit", "0", "Legit", "Stickys only detonate when you see them\nAlso ignores invis spies"); diff --git a/src/hacks/AutoTaunt.cpp b/src/hacks/AutoTaunt.cpp old mode 100755 new mode 100644 index 07c6591b..f81fbd56 --- a/src/hacks/AutoTaunt.cpp +++ b/src/hacks/AutoTaunt.cpp @@ -19,7 +19,7 @@ static CatVar enabled( CV_SWITCH, "autotaunt", "0", "AutoTaunt", "Automatically taunt after killing an enemy, use with walkbots I guess"); static CatVar chance(CV_FLOAT, "autotaunt_chance", "8", "AutoTaunt chance", - "Chance of taunting after kill. 0 to 100.", 0.0f, 100.0f); + "Chance of taunting after kill. 0 to 100.", 0.0f, 100.0f); class AutoTauntListener : public IGameEventListener2 { diff --git a/src/hacks/Bunnyhop.cpp b/src/hacks/Bunnyhop.cpp old mode 100755 new mode 100644 index a90638a1..c9a69a07 --- a/src/hacks/Bunnyhop.cpp +++ b/src/hacks/Bunnyhop.cpp @@ -15,9 +15,10 @@ namespace bunnyhop { // Var for user settings -static CatVar enabled(CV_SWITCH, "bhop_enabled", "0", "Bunnyhop", - "Enable Bunnyhop. All extra features like autojump and perfect " - "jump limit were temporary removed."); +static CatVar + enabled(CV_SWITCH, "bhop_enabled", "0", "Bunnyhop", + "Enable Bunnyhop. All extra features like autojump and perfect " + "jump limit were temporary removed."); // CatVar perfect_jump_limit(CV_INT, "bhop_enabled", "0", "Bunnyhop", "Enable // Bunnyhop. All extra features like autojump and perfect jump limit were // temporary removed."); diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp index caeaf22b..f2b1b973 100644 --- a/src/hacks/ESP.cpp +++ b/src/hacks/ESP.cpp @@ -16,117 +16,132 @@ namespace esp { // Main Switch -static CatVar enabled(CV_SWITCH, "esp_enabled", "0", "ESP", "Master ESP switch"); +static CatVar enabled(CV_SWITCH, "esp_enabled", "0", "ESP", + "Master ESP switch"); // Box esp + Options static CatEnum box_esp_enum({ "None", "Normal", "Corners" }); static CatVar box_esp(box_esp_enum, "esp_box", "2", "Box", "Draw a 2D box"); -static CatVar box_corner_size(CV_INT, "esp_box_corner_size", "10", "Corner Size"); +static CatVar box_corner_size(CV_INT, "esp_box_corner_size", "10", + "Corner Size"); // Tracers static CatEnum tracers_enum({ "OFF", "CENTER", "BOTTOM" }); -static CatVar tracers(tracers_enum, "esp_tracers", "0", "Tracers", - "SDraws a line from the player to a position on your screen"); +static CatVar + tracers(tracers_enum, "esp_tracers", "0", "Tracers", + "SDraws a line from the player to a position on your screen"); // Emoji Esp static CatEnum emoji_esp_enum({ "None", "Joy", "Thinking" }); static CatVar emoji_esp(emoji_esp_enum, "esp_emoji", "0", "Emoji ESP", - "Draw emoji on peopels head"); + "Draw emoji on peopels head"); static CatVar emoji_ok(CV_SWITCH, "esp_okhand", "0", "ok_hand", - "Draw ok_hand on hands"); + "Draw ok_hand on hands"); static CatVar emoji_esp_size(CV_FLOAT, "esp_emoji_size", "32", "Emoji ESP Size", - "Emoji size"); + "Emoji size"); static CatVar emoji_esp_scaling(CV_SWITCH, "esp_emoji_scaling", "1", - "Emoji ESP Scaling", "Emoji ESP Scaling"); -static CatVar emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size", - "Minimum size for an emoji when you use auto scaling"); + "Emoji ESP Scaling", "Emoji ESP Scaling"); +static CatVar + emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size", + "Minimum size for an emoji when you use auto scaling"); hitbox_cache::CachedHitbox *hitboxcache[32][18]{}; // Other esp options static CatEnum show_health_enum({ "None", "Text", "Healthbar", "Both" }); static CatVar show_health(show_health_enum, "esp_health", "3", "Health ESP", - "Show enemy health"); + "Show enemy health"); static CatVar draw_bones(CV_SWITCH, "esp_bones", "0", "Draw Bones"); -static CatEnum sightlines_enum({ "None", "Sniper Only", - "All" }); // I ripped of lbox's choices cuz its nice -static CatVar sightlines(sightlines_enum, "esp_sightlines", "0", "Show sightlines", - "Displays a line of where players are looking"); -static CatEnum esp_text_position_enum({ "TOP RIGHT", "BOTTOM RIGHT", "CENTER", "ABOVE", - "BELOW" }); -static CatVar esp_text_position(esp_text_position_enum, "esp_text_position", "0", - "Text position", "Defines text position"); +static CatEnum + sightlines_enum({ "None", "Sniper Only", + "All" }); // I ripped of lbox's choices cuz its nice +static CatVar sightlines(sightlines_enum, "esp_sightlines", "0", + "Show sightlines", + "Displays a line of where players are looking"); +static CatEnum esp_text_position_enum({ "TOP RIGHT", "BOTTOM RIGHT", "CENTER", + "ABOVE", "BELOW" }); +static CatVar esp_text_position(esp_text_position_enum, "esp_text_position", + "0", "Text position", "Defines text position"); static CatVar esp_expand( CV_INT, "esp_expand", "0", "Expand Esp", "Spreads out Box, health bar, and text from center"); // Note, check if this // should be int, it // is being used by // casting as float -static CatVar vischeck(CV_SWITCH, "esp_vischeck", "1", "VisCheck", - "ESP visibility check - makes enemy info behind walls darker, " - "disable this if you get FPS drops"); -static CatVar legit(CV_SWITCH, "esp_legit", "0", "Legit Mode", - "Don't show invisible enemies\nHides invisable enemies with " - "visibility enabled"); +static CatVar + vischeck(CV_SWITCH, "esp_vischeck", "1", "VisCheck", + "ESP visibility check - makes enemy info behind walls darker, " + "disable this if you get FPS drops"); +static CatVar + legit(CV_SWITCH, "esp_legit", "0", "Legit Mode", + "Don't show invisible enemies\nHides invisable enemies with " + "visibility enabled"); // Selective esp options static CatVar local_esp(CV_SWITCH, "esp_local", "1", "ESP Local Player", - "Shows local player ESP in thirdperson"); + "Shows local player ESP in thirdperson"); static CatVar buildings(CV_SWITCH, "esp_buildings", "1", "Building ESP", - "Show buildings"); + "Show buildings"); static CatVar teammates(CV_SWITCH, "esp_teammates", "0", "ESP Teammates", - "Teammate ESP"); -static CatVar tank(CV_SWITCH, "esp_show_tank", "1", "Show tank", "Show tanks in mvm"); + "Teammate ESP"); +static CatVar tank(CV_SWITCH, "esp_show_tank", "1", "Show tank", + "Show tanks in mvm"); // Text Esps static CatVar show_weapon(CV_SWITCH, "esp_weapon", "0", "Show weapon name", - "Show which weapon the enemy is using"); + "Show which weapon the enemy is using"); static CatVar show_distance(CV_SWITCH, "esp_distance", "1", "Distance ESP", - "Show distance to target"); + "Show distance to target"); static CatVar show_name(CV_SWITCH, "esp_name", "1", "Name ESP", "Show name"); -static CatVar show_class(CV_SWITCH, "esp_class", "1", "Class ESP", "Show class"); +static CatVar show_class(CV_SWITCH, "esp_class", "1", "Class ESP", + "Show class"); static CatVar show_conditions(CV_SWITCH, "esp_conds", "1", "Conditions ESP", - "Show conditions"); + "Show conditions"); static CatVar show_ubercharge(CV_SWITCH, "esp_ubercharge", "1", "Ubercharge ESP", "Show ubercharge percentage while players medigun is out"); static CatVar show_bot_id(CV_SWITCH, "esp_followbot_id", "1", "Followbot ESP", - "Show followbot ID"); + "Show followbot ID"); static CatVar powerup_esp(CV_SWITCH, "esp_powerups", "1", "Powerup ESP", - "Shows powerups a player is using"); + "Shows powerups a player is using"); // Item esp static CatVar item_esp(CV_SWITCH, "esp_item", "1", "Item ESP", - "Master Item ESP switch (health packs, etc.)"); + "Master Item ESP switch (health packs, etc.)"); static CatVar item_dropped_weapons(CV_SWITCH, "esp_item_weapons", "0", - "Dropped weapons", "Show dropped weapons"); + "Dropped weapons", "Show dropped weapons"); static CatVar item_ammo_packs(CV_SWITCH, "esp_item_ammo", "0", "Ammo packs", - "Show ammo packs"); -static CatVar item_health_packs(CV_SWITCH, "esp_item_health", "1", "Health packs", - "Show health packs"); + "Show ammo packs"); +static CatVar item_health_packs(CV_SWITCH, "esp_item_health", "1", + "Health packs", "Show health packs"); static CatVar item_powerups(CV_SWITCH, "esp_item_powerups", "1", "Powerups", - "Shows powerups in the world"); -static CatVar item_money(CV_SWITCH, "esp_money", "1", "MvM money", "Show MvM money"); + "Shows powerups in the world"); +static CatVar item_money(CV_SWITCH, "esp_money", "1", "MvM money", + "Show MvM money"); static CatVar item_money_red(CV_SWITCH, "esp_money_red", "1", "Red MvM money", - "Show red MvM money"); + "Show red MvM money"); static CatVar item_spellbooks(CV_SWITCH, "esp_spellbooks", "1", "Spellbooks", - "Spell Books"); + "Spell Books"); static CatVar item_weapon_spawners(CV_SWITCH, "esp_weapon_spawners", "1", - "Show weapon spawners", - "TF2C deathmatch weapon spawners"); -static CatVar item_adrenaline(CV_SWITCH, "esp_item_adrenaline", "0", "Show Adrenaline", - "TF2C adrenaline pills"); + "Show weapon spawners", + "TF2C deathmatch weapon spawners"); +static CatVar item_adrenaline(CV_SWITCH, "esp_item_adrenaline", "0", + "Show Adrenaline", "TF2C adrenaline pills"); // Projectile esp -static CatVar proj_esp(CV_SWITCH, "esp_proj", "1", "Projectile ESP", "Projectile ESP"); +static CatVar proj_esp(CV_SWITCH, "esp_proj", "1", "Projectile ESP", + "Projectile ESP"); static CatEnum proj_esp_enum({ "OFF", "ALL", "CRIT" }); static CatVar proj_rockets(proj_esp_enum, "esp_proj_rockets", "1", "Rockets", - "Rockets"); -static CatVar proj_arrows(proj_esp_enum, "esp_proj_arrows", "1", "Arrows", "Arrows"); -static CatVar proj_pipes(proj_esp_enum, "esp_proj_pipes", "1", "Pipes", "Pipebombs"); + "Rockets"); +static CatVar proj_arrows(proj_esp_enum, "esp_proj_arrows", "1", "Arrows", + "Arrows"); +static CatVar proj_pipes(proj_esp_enum, "esp_proj_pipes", "1", "Pipes", + "Pipebombs"); static CatVar proj_stickies(proj_esp_enum, "esp_proj_stickies", "1", "Stickies", - "Stickybombs"); -static CatVar proj_enemy(CV_SWITCH, "esp_proj_enemy", "1", "Only enemy projectiles", - "Don't show friendly projectiles"); + "Stickybombs"); +static CatVar proj_enemy(CV_SWITCH, "esp_proj_enemy", "1", + "Only enemy projectiles", + "Don't show friendly projectiles"); // Debug static CatVar entity_info(CV_SWITCH, "esp_entity", "0", "Entity ESP", - "Show entity info (debug)"); + "Show entity info (debug)"); static CatVar entity_model(CV_SWITCH, "esp_model_name", "0", "Model name ESP", - "Model name esp (DEBUG ONLY)"); + "Model name esp (DEBUG ONLY)"); static CatVar entity_id(CV_SWITCH, "esp_entity_id", "1", "Entity ID", - "Used with Entity ESP. Shows entityID"); + "Used with Entity ESP. Shows entityID"); // CatVar draw_hitbox(CV_SWITCH, "esp_hitbox", "1", "Draw Hitbox"); diff --git a/src/hacks/FollowBot.cpp b/src/hacks/FollowBot.cpp index 1aa5415a..7760259a 100644 --- a/src/hacks/FollowBot.cpp +++ b/src/hacks/FollowBot.cpp @@ -33,13 +33,13 @@ static CatVar follow_activation(CV_INT, "fb_activation", "175", CatVar follow_steam(CV_INT, "fb_steam", "0", "Follow Steam Id", "Set a steam id to let followbot prioritize players"); static CatVar mimic_slot(CV_SWITCH, "fb_mimic_slot", "0", "Mimic weapon slot", - "Mimic follow target's weapon slot"); -static CatVar always_medigun(CV_SWITCH, "fb_always_medigun", "0", "Always Medigun", - "Always use medigun"); + "Mimic follow target's weapon slot"); +static CatVar always_medigun(CV_SWITCH, "fb_always_medigun", "0", + "Always Medigun", "Always use medigun"); static CatVar sync_taunt(CV_SWITCH, "fb_sync_taunt", "0", "Synced taunt", - "Taunt when follow target does"); + "Taunt when follow target does"); static CatVar change(CV_SWITCH, "fb_switch", "1", "Change followbot target", - "Always change roaming target when possible"); + "Always change roaming target when possible"); // Something to store breadcrumbs created by followed players static std::vector breadcrumbs; static const int crumb_limit = 64; // limit diff --git a/src/hacks/Killstreak.cpp b/src/hacks/Killstreak.cpp index 8d520f38..c94d0fb8 100644 --- a/src/hacks/Killstreak.cpp +++ b/src/hacks/Killstreak.cpp @@ -16,7 +16,7 @@ namespace killstreak { static CatVar enabled(CV_SWITCH, "killstreak", "0", - "Enable killstreaks on all weapons"); + "Enable killstreaks on all weapons"); int killstreak{ 0 }; diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp index 1ca3cc0b..804c5eb8 100644 --- a/src/hacks/LagExploit.cpp +++ b/src/hacks/LagExploit.cpp @@ -16,45 +16,49 @@ namespace shared namespace lagexploit { -static CatVar toggle(CV_SWITCH, "se_toggle", "0", "toggle", "Toggle sequence exploit"); +static CatVar toggle(CV_SWITCH, "se_toggle", "0", "toggle", + "Toggle sequence exploit"); static CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot", - "Instant revvup/shoot two shots at once"); + "Instant revvup/shoot two shots at once"); // SHOUTOUTS TO BLACKFIRE static CatVar doom(CV_SWITCH, "se_doom", "0", "Shoot 2+ shots at once", - "See Center string on activation."); + "See Center string on activation."); static CatVar piss(CV_SWITCH, "se_piss", "0", "Piss", "Spam Jarate"); static CatVar razorback(CV_SWITCH, "se_antirazorback", "0", "Anti-Razorback", - "Stab through razorbacks"); + "Stab through razorbacks"); static CatVar stickyspam(CV_SWITCH, "se_stickyspam", "0", "Sticky spam", - "Allows Spam of stickies simply by holding Mouse1."); -static CatVar infinitecharge(CV_SWITCH, "se_infinite_charge", "0", - "Infinite sticky charge", - "Infinitely charge stickies, (can be used for sniping " - "and or b1g dmg using the quickiebomb launcher)"); + "Allows Spam of stickies simply by holding Mouse1."); +static CatVar + infinitecharge(CV_SWITCH, "se_infinite_charge", "0", + "Infinite sticky charge", + "Infinitely charge stickies, (can be used for sniping " + "and or b1g dmg using the quickiebomb launcher)"); static CatVar cloak(CV_SWITCH, "se_cloak", "0", "Instant decloak/cloak", ""); static CatVar cap(CV_SWITCH, "se_cap", "0", "Auto instant cap", ""); static CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points", - "Automatically farm points by touching " - "the cart (only works on attacking " - "team)"); + "Automatically farm points by touching " + "the cart (only works on attacking " + "team)"); static CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0", - "Instant weapon switch", ""); + "Instant weapon switch", ""); static CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key"); static CatVar weaponswitch(CV_KEY, "se_switch_key", "0", - "Switch spam key (for gru) key"); + "Switch spam key (for gru) key"); static CatVar delay1(CV_INT, "se_switch_delay1", "0", - "Delay before switching to melee"); + "Delay before switching to melee"); static CatVar delay2(CV_INT, "se_switch_delay2", "0", - "Delay before switching to Primary"); -static CatVar master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit", - "Master switch for the sequence exploit\nDisabling this " - "disables everything else that uses it"); + "Delay before switching to Primary"); +static CatVar + master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit", + "Master switch for the sequence exploit\nDisabling this " + "disables everything else that uses it"); static CatVar value(CV_INT, "se_value", "900", "Sequence exploit value", - "Value of user cmds to spam with"); -static CatVar cap_range(CV_FLOAT, "se_cap_range", "200.0f", "Autocap range", - "Autocap range, increase if you notice that you only lagy " - "once you are already in the cap zone"); + "Value of user cmds to spam with"); +static CatVar + cap_range(CV_FLOAT, "se_cap_range", "200.0f", "Autocap range", + "Autocap range, increase if you notice that you only lagy " + "once you are already in the cap zone"); CatCommand do_lagexploit("se_do", "Sequence exploit (for use in scripts)", []() { AddExploitTicks(6); }); int exticks = 0; diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp index e04d0ead..0253644a 100644 --- a/src/hacks/Misc.cpp +++ b/src/hacks/Misc.cpp @@ -26,35 +26,39 @@ namespace misc { static CatVar debug_info(CV_SWITCH, "debug_info", "0", "Debug info", - "Shows some debug info in-game"); + "Shows some debug info in-game"); static CatVar flashlight_spam(CV_SWITCH, "flashlight", "0", "Flashlight spam", - "HL2DM flashlight spam"); -static CatVar auto_balance_spam(CV_SWITCH, "request_balance_spam", "0", - "Inf Auto Balance Spam", - "Use to send a autobalance request to the server that " - "doesnt prevent you from using it again\nCredits to " - "Blackfire"); -static CatVar anti_afk(CV_SWITCH, "anti_afk", "0", "Anti-AFK", - "Sends random commands to prevent being kicked from server"); + "HL2DM flashlight spam"); +static CatVar + auto_balance_spam(CV_SWITCH, "request_balance_spam", "0", + "Inf Auto Balance Spam", + "Use to send a autobalance request to the server that " + "doesnt prevent you from using it again\nCredits to " + "Blackfire"); +static CatVar + anti_afk(CV_SWITCH, "anti_afk", "0", "Anti-AFK", + "Sends random commands to prevent being kicked from server"); static CatVar auto_strafe(CV_SWITCH, "auto_strafe", "0", "Auto-Strafe", - "Automaticly airstrafes for you."); -static CatVar render_zoomed(CV_SWITCH, "render_zoomed", "0", - "Render model when zoomed-in", - "Renders player model while being zoomed in as Sniper"); + "Automaticly airstrafes for you."); +static CatVar + render_zoomed(CV_SWITCH, "render_zoomed", "0", + "Render model when zoomed-in", + "Renders player model while being zoomed in as Sniper"); static CatVar nopush_enabled(CV_SWITCH, "nopush_enabled", "0", "No Push", - "Prevents other players from pushing you around."); + "Prevents other players from pushing you around."); static CatVar no_homo(CV_SWITCH, "no_homo", "1", "No Homo", "read if gay"); // Taunting stuff static CatVar tauntslide(CV_SWITCH, "tauntslide", "0", "TF2C tauntslide", - "Allows moving and shooting while taunting"); + "Allows moving and shooting while taunting"); static CatVar tauntslide_tf2(CV_SWITCH, "tauntslide_tf2", "0", "Tauntslide", - "Allows free movement while taunting with movable " - "taunts\nOnly works in tf2"); + "Allows free movement while taunting with movable " + "taunts\nOnly works in tf2"); static CatVar show_spectators(CV_SWITCH, "show_spectators", "0", "Show spectators", "Show who's spectating you\nonly works in valve servers"); -static CatVar god_mode(CV_SWITCH, "godmode", "0", "no description", "no description"); +static CatVar god_mode(CV_SWITCH, "godmode", "0", "no description", + "no description"); void *C_TFPlayer__ShouldDraw_original = nullptr; bool C_TFPlayer__ShouldDraw_hook(IClientEntity *thisptr) diff --git a/src/hacks/Radar.cpp b/src/hacks/Radar.cpp old mode 100755 new mode 100644 index c29d687a..b790c807 --- a/src/hacks/Radar.cpp +++ b/src/hacks/Radar.cpp @@ -21,27 +21,30 @@ std::array tx_teams; std::array tx_items; static CatVar size(CV_INT, "radar_size", "300", "Radar size", - "Defines radar size in pixels"); + "Defines radar size in pixels"); static CatVar zoom(CV_FLOAT, "radar_zoom", "20", "Radar zoom", - "Defines radar zoom (1px = Xhu)"); + "Defines radar zoom (1px = Xhu)"); static CatVar healthbar(CV_SWITCH, "radar_health", "1", "Radar healthbar", - "Show radar healthbar"); + "Show radar healthbar"); static CatVar enemies_over_teammates( CV_SWITCH, "radar_enemies_top", "1", "Show enemies on top", "If true, radar will render enemies on top of teammates"); static CatVar icon_size(CV_INT, "radar_icon_size", "20", "Icon size", - "Defines radar icon size"); + "Defines radar icon size"); static CatVar radar_enabled(CV_SWITCH, "radar", "0", "Enable", "Enable Radar"); static CatVar radar_x(CV_INT, "radar_x", "100", "Radar X", - "Defines radar position (X)"); + "Defines radar position (X)"); static CatVar radar_y(CV_INT, "radar_y", "100", "Radar Y", - "Defines radar position (Y)"); -static CatVar use_icons(CV_SWITCH, "radar_icons", "1", "Use Icons", - "Radar will use class icons instead of class portraits"); -static CatVar show_teammates(CV_SWITCH, "radar_teammates", "1", "Show Teammates"); + "Defines radar position (Y)"); +static CatVar + use_icons(CV_SWITCH, "radar_icons", "1", "Use Icons", + "Radar will use class icons instead of class portraits"); +static CatVar show_teammates(CV_SWITCH, "radar_teammates", "1", + "Show Teammates"); static CatVar show_healthpacks(CV_SWITCH, "radar_healthpacks", "1", - "Show Healthpacks"); -static CatVar show_ammopacks(CV_SWITCH, "radar_ammopacks", "1", "Show Ammopacks"); + "Show Healthpacks"); +static CatVar show_ammopacks(CV_SWITCH, "radar_ammopacks", "1", + "Show Ammopacks"); void Init() { diff --git a/src/hacks/Spam.cpp b/src/hacks/Spam.cpp old mode 100755 new mode 100644 index b2aa5c35..8350e9c6 --- a/src/hacks/Spam.cpp +++ b/src/hacks/Spam.cpp @@ -21,20 +21,22 @@ CatVar spam_source(spam_enum, "spam", "0", "Chat Spam", "in cat_spam_file and loaded with cat_spam_reload (Use " "console!)"); static CatVar random_order(CV_SWITCH, "spam_random", "0", "Random Order"); -static CatVar filename(CV_STRING, "spam_file", "spam.txt", "Spam file", - "Spam file name. Each line should be no longer than 100 " - "characters, file must be located in cathook data folder"); +static CatVar + filename(CV_STRING, "spam_file", "spam.txt", "Spam file", + "Spam file name. Each line should be no longer than 100 " + "characters, file must be located in cathook data folder"); CatCommand reload("spam_reload", "Reload spam file", Reload); static CatVar spam_delay(CV_INT, "spam_delay", "800", "Spam delay", - "Delay between spam messages (in ms)", 0.0f, 8000.0f); + "Delay between spam messages (in ms)", 0.0f, 8000.0f); static CatEnum voicecommand_enum({ "DISABLED", "RANDOM", "MEDIC", "THANKS", "NICE SHOT", "CHEERS", "JEERS" }); static CatVar voicecommand_spam(voicecommand_enum, "spam_voicecommand", "0", - "Voice Command Spam", "Spams tf voice commands"); + "Voice Command Spam", + "Spams tf voice commands"); static CatVar teamname_spam(CV_SWITCH, "spam_teamname", "0", "Teamname Spam", - "Spam changes the tournament name"); + "Spam changes the tournament name"); std::chrono::time_point last_spam_point{}; diff --git a/src/hacks/SpyAlert.cpp b/src/hacks/SpyAlert.cpp old mode 100755 new mode 100644 index 2ad8d5ad..7133f7a9 --- a/src/hacks/SpyAlert.cpp +++ b/src/hacks/SpyAlert.cpp @@ -15,17 +15,17 @@ namespace spyalert { static CatVar enabled(CV_SWITCH, "spyalert_enabled", "0", "Enable", - "Master SpyAlert switch"); + "Master SpyAlert switch"); static CatVar distance_warning(CV_FLOAT, "spyalert_warning", "500.0", - "Warning distance", - "Distance where yellow warning shows"); + "Warning distance", + "Distance where yellow warning shows"); static CatVar distance_backstab(CV_FLOAT, "spyalert_backstab", "200.0", - "Backstab distance", - "Distance where red warning shows"); + "Backstab distance", + "Distance where red warning shows"); static CatVar sound_alerts(CV_SWITCH, "spyalert_sound", "1", "Sound Alerts", - "Demoman yells spy when a spy is within distance"); + "Demoman yells spy when a spy is within distance"); static CatVar sound_alert_interval(CV_FLOAT, "spyalert_interval", "3", - "Alert Interval", "Sound alert interval"); + "Alert Interval", "Sound alert interval"); bool warning_triggered = false; bool backstab_triggered = false; diff --git a/src/hacks/Walkbot.cpp b/src/hacks/Walkbot.cpp index ab75f510..247ba3bf 100644 --- a/src/hacks/Walkbot.cpp +++ b/src/hacks/Walkbot.cpp @@ -449,27 +449,27 @@ index_t CreateNode(const Vector &xyz) } static CatVar active_recording(CV_SWITCH, "wb_recording", "0", "Do recording", - "Use BindToggle with this"); + "Use BindToggle with this"); static CatVar draw_info(CV_SWITCH, "wb_info", "1", "Walkbot info"); static CatVar draw_path(CV_SWITCH, "wb_path", "1", "Walkbot path"); static CatVar draw_nodes(CV_SWITCH, "wb_nodes", "1", "Walkbot nodes"); static CatVar draw_indices(CV_SWITCH, "wb_indices", "0", "Node indices"); static CatVar free_move(CV_SWITCH, "wb_freemove", "1", "Allow free movement", - "Allow free movement while pressing movement keys"); + "Allow free movement while pressing movement keys"); static CatVar spawn_distance(CV_FLOAT, "wb_node_spawn_distance", "54", - "Node spawn distance"); + "Node spawn distance"); static CatVar max_distance(CV_FLOAT, "wb_replay_max_distance", "100", - "Max distance to node when replaying"); + "Max distance to node when replaying"); static CatVar reach_distance( CV_FLOAT, "wb_replay_reach_distance", "32", "Distance where bot can be considered 'stepping' on the node"); static CatVar draw_connection_flags(CV_SWITCH, "wb_connection_flags", "1", - "Connection flags"); + "Connection flags"); static CatVar force_slot(CV_INT, "wb_force_slot", "1", "Force slot", - "Walkbot will always select weapon in this slot"); + "Walkbot will always select weapon in this slot"); static CatVar leave_if_empty(CV_SWITCH, "wb_leave_if_empty", "0", - "Leave if no walkbot", - "Leave game if there is no walkbot map"); + "Leave if no walkbot", + "Leave game if there is no walkbot map"); CatCommand c_start_recording("wb_record", "Start recording", []() { state::state = WB_RECORDING; }); diff --git a/src/hooks/GetFriendPersonaName.cpp b/src/hooks/GetFriendPersonaName.cpp index ba062afe..bd863aef 100644 --- a/src/hooks/GetFriendPersonaName.cpp +++ b/src/hooks/GetFriendPersonaName.cpp @@ -8,11 +8,12 @@ static CatVar ipc_name(CV_STRING, "name_ipc", "", "IPC Name"); static CatEnum namesteal_enum({ "OFF", "PASSIVE", "ACTIVE" }); -static CatVar namesteal(namesteal_enum, "name_stealer", "0", "Name Stealer", - "Attemt to steal your teammates names. Usefull for avoiding " - "kicks\nPassive only changes when the name stolen is no " - "longer the best name to use\nActive Attemps to change the " - "name whenever possible"); +static CatVar + namesteal(namesteal_enum, "name_stealer", "0", "Name Stealer", + "Attemt to steal your teammates names. Usefull for avoiding " + "kicks\nPassive only changes when the name stolen is no " + "longer the best name to use\nActive Attemps to change the " + "name whenever possible"); static std::string stolen_name; diff --git a/src/hooks/LevelInit.cpp b/src/hooks/LevelInit.cpp index 04f59fc2..6eaa1be3 100644 --- a/src/hooks/LevelInit.cpp +++ b/src/hooks/LevelInit.cpp @@ -38,36 +38,36 @@ const char *skynum[] = { "sky_tf2_04", "sky_pyroland_02", "sky_pyroland_03" }; static CatEnum skys({ "sky_tf2_04", - "sky_upward", - "sky_dustbowl_01", - "sky_goldrush_01", - "sky_granary_01", - "sky_well_01", - "sky_gravel_01", - "sky_badlands_01", - "sky_hydro_01", - "sky_night_01", - "sky_nightfall_01", - "sky_trainyard_01", - "sky_stormfront_01", - "sky_morningsnow_01", - "sky_alpinestorm_01", - "sky_harvest_01", - "sky_harvest_night_01", - "sky_halloween", - "sky_halloween_night_01", - "sky_halloween_night2014_01", - "sky_island_01", - "sky_jungle_01", - "sky_invasion2fort_01", - "sky_well_02", - "sky_outpost_01", - "sky_coastal_01", - "sky_rainbow_01", - "sky_badlands_pyroland_01", - "sky_pyroland_01", - "sky_pyroland_02", - "sky_pyroland_03" }); + "sky_upward", + "sky_dustbowl_01", + "sky_goldrush_01", + "sky_granary_01", + "sky_well_01", + "sky_gravel_01", + "sky_badlands_01", + "sky_hydro_01", + "sky_night_01", + "sky_nightfall_01", + "sky_trainyard_01", + "sky_stormfront_01", + "sky_morningsnow_01", + "sky_alpinestorm_01", + "sky_harvest_01", + "sky_harvest_night_01", + "sky_halloween", + "sky_halloween_night_01", + "sky_halloween_night2014_01", + "sky_island_01", + "sky_jungle_01", + "sky_invasion2fort_01", + "sky_well_02", + "sky_outpost_01", + "sky_coastal_01", + "sky_rainbow_01", + "sky_badlands_pyroland_01", + "sky_pyroland_01", + "sky_pyroland_02", + "sky_pyroland_03" }); static CatVar skybox_changer(skys, "skybox_changer", "0", "Change Skybox to this skybox", "Change Skybox to this skybox, only changes on map load"); diff --git a/src/hooks/visual/OverrideView.cpp b/src/hooks/visual/OverrideView.cpp index 3b453d5b..e8e22785 100644 --- a/src/hooks/visual/OverrideView.cpp +++ b/src/hooks/visual/OverrideView.cpp @@ -6,11 +6,12 @@ #include #include "HookedMethods.hpp" -static CatVar override_fov_zoomed(CV_FLOAT, "fov_zoomed", "0", "FOV override (zoomed)", - "Overrides FOV with this value when zoomed in " - "(default FOV when zoomed is 20)"); +static CatVar + override_fov_zoomed(CV_FLOAT, "fov_zoomed", "0", "FOV override (zoomed)", + "Overrides FOV with this value when zoomed in " + "(default FOV when zoomed is 20)"); static CatVar override_fov(CV_FLOAT, "fov", "0", "FOV override", - "Overrides FOV with this value"); + "Overrides FOV with this value"); static CatVar freecam(CV_KEY, "debug_freecam", "0", "Freecam"); diff --git a/src/hooks/visual/PaintTraverse.cpp b/src/hooks/visual/PaintTraverse.cpp index 56ad407a..95529457 100644 --- a/src/hooks/visual/PaintTraverse.cpp +++ b/src/hooks/visual/PaintTraverse.cpp @@ -13,12 +13,12 @@ CatVar disable_visuals(CV_SWITCH, "no_visuals", "0", "Disable ALL drawing", CatVar no_zoom(CV_SWITCH, "no_zoom", "0", "Disable scope", "Disables black scope overlay"); static CatVar pure_bypass(CV_SWITCH, "pure_bypass", "0", "Pure Bypass", - "Bypass sv_pure"); + "Bypass sv_pure"); void *pure_orig = nullptr; void **pure_addr = nullptr; static CatEnum software_cursor_enum({ "KEEP", "ALWAYS", "NEVER", "MENU ON", - "MENU OFF" }); + "MENU OFF" }); static CatVar software_cursor_mode(software_cursor_enum, "software_cursor_mode", "0", "Software cursor", diff --git a/src/prediction.cpp b/src/prediction.cpp old mode 100755 new mode 100644 index 726e4898..197a3af1 --- a/src/prediction.cpp +++ b/src/prediction.cpp @@ -254,8 +254,8 @@ Vector ProjectilePrediction_Engine(CachedEntity *ent, int hb, float speed, static CatVar debug_pp_extrapolate( CV_SWITCH, "debug_pp_extrapolate", "0", "Extrapolate entity position when predicting projectiles"); -static CatVar debug_pp_rockettimeping(CV_SWITCH, "debug_pp_rocket_time_ping", "0", - "Compensate for ping in pp"); +static CatVar debug_pp_rockettimeping(CV_SWITCH, "debug_pp_rocket_time_ping", + "0", "Compensate for ping in pp"); Vector ProjectilePrediction(CachedEntity *ent, int hb, float speed, float gravitymod, float entgmod) diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp index 414683f8..f6d240bc 100644 --- a/src/visual/EffectChams.cpp +++ b/src/visual/EffectChams.cpp @@ -15,7 +15,8 @@ namespace effect_chams { -static CatVar enable(CV_SWITCH, "chams_enable", "0", "Enable", "Main chams switch"); +static CatVar enable(CV_SWITCH, "chams_enable", "0", "Enable", + "Main chams switch"); static CatVar flat(CV_SWITCH, "chams_flat", "0", "Flat", "Makes chams brighter and more full"); static CatVar health(CV_SWITCH, "chams_health", "0", "Health", diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp old mode 100755 new mode 100644 index b4065515..2e28f9c2 --- a/src/visual/EffectGlow.cpp +++ b/src/visual/EffectGlow.cpp @@ -30,7 +30,8 @@ CScreenSpaceEffectRegistration::CScreenSpaceEffectRegistration( namespace effect_glow { -static CatVar enable(CV_SWITCH, "glow_enable", "0", "Enable", "Main glow switch"); +static CatVar enable(CV_SWITCH, "glow_enable", "0", "Enable", + "Main glow switch"); static CatVar health(CV_SWITCH, "glow_health", "0", "Health", "Change glow color based on their health"); static CatVar teammates(CV_SWITCH, "glow_teammates", "0", "Teammates", diff --git a/src/visual/colors.cpp b/src/visual/colors.cpp old mode 100755 new mode 100644 index 9ba3289d..542dad36 --- a/src/visual/colors.cpp +++ b/src/visual/colors.cpp @@ -8,18 +8,19 @@ #include "common.hpp" static CatVar user_red_blue(CV_INT, "esp_color_red_b", "0", "Red Team: Blue", - "Blue color for red team", 255); + "Blue color for red team", 255); static CatVar user_red_green(CV_INT, "esp_color_red_g", "0", "Red Team: Green", - "Green color for red team", 255); + "Green color for red team", 255); static CatVar user_red_red(CV_INT, "esp_color_red_r", "0", "Red Team: Red", - "Red color for red team", 255); + "Red color for red team", 255); static CatVar user_blue_blue(CV_INT, "esp_color_blue_b", "0", "Blue Team: Blue", - "Blue color for blue team", 255); -static CatVar user_blue_green(CV_INT, "esp_color_blue_g", "0", "Blue Team: Green", - "Green color for blue team", 255); + "Blue color for blue team", 255); +static CatVar user_blue_green(CV_INT, "esp_color_blue_g", "0", + "Blue Team: Green", "Green color for blue team", + 255); static CatVar user_blue_red(CV_INT, "esp_color_blue_r", "0", "Blue Team: Red", - "Red color for blue team", 255); + "Red color for blue team", 255); rgba_t colors::EntityF(CachedEntity *ent) { diff --git a/src/visual/drawmgr.cpp b/src/visual/drawmgr.cpp index 68dabfaf..3a921f02 100644 --- a/src/visual/drawmgr.cpp +++ b/src/visual/drawmgr.cpp @@ -50,11 +50,11 @@ void BeginCheatVisuals() std::mutex drawing_mutex; static CatVar info_text(CV_SWITCH, "info", "1", "Show info", - "Show cathook version in top left corner"); + "Show cathook version in top left corner"); static CatVar info_text_min(CV_SWITCH, "info_min", "0", "Show minimal info", - "Only show cathook title in top left corner"); + "Only show cathook title in top left corner"); static CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1", - "Enable Nullcore watermark", ""); + "Enable Nullcore watermark", ""); void DrawCheatVisuals() { diff --git a/src/visual/fidgetspinner.cpp b/src/visual/fidgetspinner.cpp index df9a599a..1b6b3647 100644 --- a/src/visual/fidgetspinner.cpp +++ b/src/visual/fidgetspinner.cpp @@ -13,7 +13,7 @@ #ifndef FEATURE_FIDGET_SPINNER_ENABLED static CatVar enable_spinner(CV_SWITCH, "fidgetspinner", "0", "Fidget Spinner", - "Part of Cathook Autism Awareness program"); + "Part of Cathook Autism Awareness program"); CatVar v9mode(CV_SWITCH, "nullcore_mode", "0", "Nullcore mode", "Part of Cathook Autism Awareness program"); @@ -52,14 +52,15 @@ void InitSpinner() } static CatVar spinner_speed_cap(CV_FLOAT, "fidgetspinner_speed_cap", "30", - "Speed cap"); + "Speed cap"); static CatVar spinner_speed_scale(CV_FLOAT, "fidgetspinner_speed_scale", "0.03", - "Speed scale"); + "Speed scale"); static CatVar spinner_decay_speed(CV_FLOAT, "fidgetspinner_decay_speed", "0.1", - "Decay speed"); -static CatVar spinner_scale(CV_FLOAT, "fidgetspinner_scale", "32", "Spinner Size"); + "Decay speed"); +static CatVar spinner_scale(CV_FLOAT, "fidgetspinner_scale", "32", + "Spinner Size"); static CatVar spinner_min_speed(CV_FLOAT, "fidgetspinner_min_speed", "2", - "Spinner Min Speed"); + "Spinner Min Speed"); draw_api::texture_handle_t text{ GLEZ_TEXTURE_INVALID }; diff --git a/src/visual/menu/ncc/Menu.cpp b/src/visual/menu/ncc/Menu.cpp index 2c05163a..854be323 100644 --- a/src/visual/menu/ncc/Menu.cpp +++ b/src/visual/menu/ncc/Menu.cpp @@ -23,10 +23,11 @@ unsigned long font_item = 0; CatVar scale(CV_FLOAT, "gui_ncc_scale", "1", "NCC GUI Scale", "Defines scale of NCC gui", 0.5f, 4.0f); static CatVar font_family(fonts::family_enum, "gui_ncc_font_family", "3", - "NCC Font Family", "Defines font family for NCC menu"); -static CatVar font_title_family(fonts::family_enum, "gui_ncc_font_title_family", "4", - "NCC Title Family", - "Defines font family for NCC menu titles"); + "NCC Font Family", + "Defines font family for NCC menu"); +static CatVar font_title_family(fonts::family_enum, "gui_ncc_font_title_family", + "4", "NCC Title Family", + "Defines font family for NCC menu titles"); Tooltip *tooltip = nullptr; Root *root = nullptr; From 692aeb7dfa5e0d15a5012f3ba4e8ab9a408466de Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Wed, 2 May 2018 17:58:08 +0200 Subject: [PATCH 2/2] Fix compile issues and WIP stuff --- include/MiscTemporary.hpp | 3 +-- include/hooks/HookedMethods.hpp | 2 +- src/MiscTemporary.cpp | 3 --- src/hitrate.cpp | 2 +- src/hooks/SendNetMsg.cpp | 8 ++------ src/hooks/visual/FrameStageNotify.cpp | 12 ++++++++++-- src/sdk/netmessage.cpp | 2 +- src/visual/menu/compatibilitylayer.cpp | 1 + 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/MiscTemporary.hpp b/include/MiscTemporary.hpp index f36c6301..6d59bf1c 100644 --- a/include/MiscTemporary.hpp +++ b/include/MiscTemporary.hpp @@ -8,7 +8,6 @@ #include "common.hpp" // This is a temporary file to put code that needs moving/refactoring in. - extern bool *bSendPackets; extern CatVar no_zoom; extern CatVar clean_screenshots; @@ -26,4 +25,4 @@ extern CatVar semiauto; extern CatVar engine_pred; #if ENABLE_VISUALS extern int spectator_target; -#endif \ No newline at end of file +#endif diff --git a/include/hooks/HookedMethods.hpp b/include/hooks/HookedMethods.hpp index 9a39fa00..5e0ea1b8 100644 --- a/include/hooks/HookedMethods.hpp +++ b/include/hooks/HookedMethods.hpp @@ -119,4 +119,4 @@ typedef IMaterial *(*FindMaterial_t)(void *, const char *, const char *, bool, const char *pComplainPrefix); #endif -#endif \ No newline at end of file +#endif diff --git a/src/MiscTemporary.cpp b/src/MiscTemporary.cpp index 55c9d16f..a35c843c 100644 --- a/src/MiscTemporary.cpp +++ b/src/MiscTemporary.cpp @@ -4,7 +4,6 @@ */ #include "MiscTemporary.hpp" - CatVar minigun_jump(CV_SWITCH, "minigun_jump", "0", "TF2C minigun jump", "Allows jumping while shooting with minigun"); @@ -24,8 +23,6 @@ CatVar serverlag_amount( CV_INT, "serverlag", "0", "serverlag", "Lag the server by spamming this many voicecommands per tick"); CatVar semiauto(CV_INT, "semiauto", "0", "Semiauto"); -static CatVar servercrash(CV_SWITCH, "servercrash", "0", "crash servers", - "Crash servers by spamming signon net messages"); bool *bSendPackets; CatVar crypt_chat( diff --git a/src/hitrate.cpp b/src/hitrate.cpp index 3e461fd1..a8574dd4 100755 --- a/src/hitrate.cpp +++ b/src/hitrate.cpp @@ -18,7 +18,7 @@ int count_shots{ 0 }; int count_hits{ 0 }; int count_hits_head{ 0 }; -static CatVar hitrate_check(CV_SWITCH, "hitrate", "1", "Monitor hitrate"); +CatVar hitrate_check(CV_SWITCH, "hitrate", "1", "Monitor hitrate"); std::vector> shots{}; diff --git a/src/hooks/SendNetMsg.cpp b/src/hooks/SendNetMsg.cpp index 01543a4d..4cca2205 100644 --- a/src/hooks/SendNetMsg.cpp +++ b/src/hooks/SendNetMsg.cpp @@ -12,11 +12,8 @@ static CatVar newlines_msg(CV_INT, "chat_newlines", "0", "Prefix newlines", static CatVar log_sent(CV_SWITCH, "debug_log_sent_messages", "0", "Log sent messages"); -static CatVar airstuck(CV_KEY, "airstuck", "0", "Airstuck", ""); - -namespace hooked_methods +static CatVar airstuck(CV_KEY, "airstuck", "0", "Airstuck", "");namespace hooked_methods { - DEFINE_HOOKED_METHOD(SendNetMsg, bool, INetChannel *this_, INetMessage &msg, bool force_reliable, bool voice) { @@ -24,7 +21,6 @@ DEFINE_HOOKED_METHOD(SendNetMsg, bool, INetChannel *this_, INetMessage &msg, int offset; std::string newlines; NET_StringCmd stringcmd; - // net_StringCmd if (msg.GetType() == 4 && (newlines_msg || crypt_chat)) { @@ -103,4 +99,4 @@ DEFINE_HOOKED_METHOD(SendNetMsg, bool, INetChannel *this_, INetMessage &msg, } return original::SendNetMsg(this_, msg, force_reliable, voice); } -} \ No newline at end of file +} diff --git a/src/hooks/visual/FrameStageNotify.cpp b/src/hooks/visual/FrameStageNotify.cpp index 3157a02b..aec1279e 100644 --- a/src/hooks/visual/FrameStageNotify.cpp +++ b/src/hooks/visual/FrameStageNotify.cpp @@ -9,7 +9,8 @@ static CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles"); static CatVar nightmode(CV_SWITCH, "nightmode", "0", "Enable nightmode", ""); - +static CatVar servercrash(CV_SWITCH, "servercrash", "0", "crash servers", + "Crash servers by spamming signon net messages"); namespace hooked_methods { @@ -56,6 +57,13 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_, OldNightmode = nightmode; } } +// if (servercrash.KeyDown()) { +// NET_SignonState voice_meme(6, 0); +// INetChannel *ch = (INetChannel *) g_IEngine->GetNetChannelInfo(); +// for(int i = 0; i<128; i++) +// ch->SendNetMsg((INetMessage&)voice_meme, false, false); +// ch->Transmit(); +// } static IClientEntity *ent; PROF_SECTION(FrameStageNotify_TOTAL); @@ -130,4 +138,4 @@ DEFINE_HOOKED_METHOD(FrameStageNotify, void, void *this_, } return original::FrameStageNotify(this_, stage); } -} \ No newline at end of file +} diff --git a/src/sdk/netmessage.cpp b/src/sdk/netmessage.cpp index 867eb546..3680d8d2 100755 --- a/src/sdk/netmessage.cpp +++ b/src/sdk/netmessage.cpp @@ -408,7 +408,7 @@ bool NET_SignonState::ReadFromBuffer(bf_read &buffer) const char *NET_SignonState::ToString(void) const { - return "(null)"; + return strfmt("net_SignonState: state %i, count %i", m_nSignonState, m_nSpawnCount); } bool NET_SetConVar::WriteToBuffer(bf_write &buffer) diff --git a/src/visual/menu/compatibilitylayer.cpp b/src/visual/menu/compatibilitylayer.cpp index 39e8c26d..b6a4300b 100755 --- a/src/visual/menu/compatibilitylayer.cpp +++ b/src/visual/menu/compatibilitylayer.cpp @@ -8,6 +8,7 @@ const std::vector fonts = { "Tahoma Bold", "Tahoma", "TF2 Build", "Verdana", "Verdana Bold", "Arial", "Courier New", "Ubuntu Mono Bold" }; +CatEnum family_enum(fonts); } int colorsint::FromHSL(float h, float s, float v)