diff --git a/.cproject b/.cproject index 23b823c8..1d5b7a84 100644 --- a/.cproject +++ b/.cproject @@ -51,9 +51,8 @@ - - + @@ -107,21 +108,34 @@ - - + + + + + + + + + + + + + + - - diff --git a/src/freetype-gl/distance-field.c b/freetype-gl/distance-field.c similarity index 100% rename from src/freetype-gl/distance-field.c rename to freetype-gl/distance-field.c diff --git a/src/freetype-gl/distance-field.h b/freetype-gl/distance-field.h similarity index 100% rename from src/freetype-gl/distance-field.h rename to freetype-gl/distance-field.h diff --git a/src/freetype-gl/edtaa3func.c b/freetype-gl/edtaa3func.c similarity index 100% rename from src/freetype-gl/edtaa3func.c rename to freetype-gl/edtaa3func.c diff --git a/src/freetype-gl/edtaa3func.h b/freetype-gl/edtaa3func.h similarity index 100% rename from src/freetype-gl/edtaa3func.h rename to freetype-gl/edtaa3func.h diff --git a/src/freetype-gl/font-manager.c b/freetype-gl/font-manager.c similarity index 100% rename from src/freetype-gl/font-manager.c rename to freetype-gl/font-manager.c diff --git a/src/freetype-gl/font-manager.h b/freetype-gl/font-manager.h similarity index 100% rename from src/freetype-gl/font-manager.h rename to freetype-gl/font-manager.h diff --git a/src/freetype-gl/freetype-gl.h b/freetype-gl/freetype-gl.h similarity index 100% rename from src/freetype-gl/freetype-gl.h rename to freetype-gl/freetype-gl.h diff --git a/src/freetype-gl/markup.h b/freetype-gl/markup.h similarity index 100% rename from src/freetype-gl/markup.h rename to freetype-gl/markup.h diff --git a/src/freetype-gl/mat4.c b/freetype-gl/mat4.c similarity index 100% rename from src/freetype-gl/mat4.c rename to freetype-gl/mat4.c diff --git a/src/freetype-gl/mat4.h b/freetype-gl/mat4.h similarity index 100% rename from src/freetype-gl/mat4.h rename to freetype-gl/mat4.h diff --git a/src/freetype-gl/opengl.h b/freetype-gl/opengl.h similarity index 100% rename from src/freetype-gl/opengl.h rename to freetype-gl/opengl.h diff --git a/src/freetype-gl/platform.c b/freetype-gl/platform.c similarity index 100% rename from src/freetype-gl/platform.c rename to freetype-gl/platform.c diff --git a/src/freetype-gl/platform.h b/freetype-gl/platform.h similarity index 100% rename from src/freetype-gl/platform.h rename to freetype-gl/platform.h diff --git a/src/freetype-gl/shader.c b/freetype-gl/shader.c similarity index 100% rename from src/freetype-gl/shader.c rename to freetype-gl/shader.c diff --git a/src/freetype-gl/shader.h b/freetype-gl/shader.h similarity index 100% rename from src/freetype-gl/shader.h rename to freetype-gl/shader.h diff --git a/src/freetype-gl/text-buffer.c b/freetype-gl/text-buffer.c similarity index 100% rename from src/freetype-gl/text-buffer.c rename to freetype-gl/text-buffer.c diff --git a/src/freetype-gl/text-buffer.h b/freetype-gl/text-buffer.h similarity index 100% rename from src/freetype-gl/text-buffer.h rename to freetype-gl/text-buffer.h diff --git a/src/freetype-gl/texture-atlas.c b/freetype-gl/texture-atlas.c similarity index 100% rename from src/freetype-gl/texture-atlas.c rename to freetype-gl/texture-atlas.c diff --git a/src/freetype-gl/texture-atlas.h b/freetype-gl/texture-atlas.h similarity index 100% rename from src/freetype-gl/texture-atlas.h rename to freetype-gl/texture-atlas.h diff --git a/src/freetype-gl/texture-font.c b/freetype-gl/texture-font.c similarity index 100% rename from src/freetype-gl/texture-font.c rename to freetype-gl/texture-font.c diff --git a/src/freetype-gl/texture-font.h b/freetype-gl/texture-font.h similarity index 100% rename from src/freetype-gl/texture-font.h rename to freetype-gl/texture-font.h diff --git a/src/freetype-gl/utf8-utils.c b/freetype-gl/utf8-utils.c similarity index 100% rename from src/freetype-gl/utf8-utils.c rename to freetype-gl/utf8-utils.c diff --git a/src/freetype-gl/utf8-utils.h b/freetype-gl/utf8-utils.h similarity index 100% rename from src/freetype-gl/utf8-utils.h rename to freetype-gl/utf8-utils.h diff --git a/src/freetype-gl/vec234.h b/freetype-gl/vec234.h similarity index 100% rename from src/freetype-gl/vec234.h rename to freetype-gl/vec234.h diff --git a/src/freetype-gl/vector.c b/freetype-gl/vector.c similarity index 100% rename from src/freetype-gl/vector.c rename to freetype-gl/vector.c diff --git a/src/freetype-gl/vector.h b/freetype-gl/vector.h similarity index 100% rename from src/freetype-gl/vector.h rename to freetype-gl/vector.h diff --git a/src/freetype-gl/vertex-attribute.c b/freetype-gl/vertex-attribute.c similarity index 100% rename from src/freetype-gl/vertex-attribute.c rename to freetype-gl/vertex-attribute.c diff --git a/src/freetype-gl/vertex-attribute.h b/freetype-gl/vertex-attribute.h similarity index 100% rename from src/freetype-gl/vertex-attribute.h rename to freetype-gl/vertex-attribute.h diff --git a/src/freetype-gl/vertex-buffer.c b/freetype-gl/vertex-buffer.c similarity index 100% rename from src/freetype-gl/vertex-buffer.c rename to freetype-gl/vertex-buffer.c diff --git a/src/freetype-gl/vertex-buffer.h b/freetype-gl/vertex-buffer.h similarity index 100% rename from src/freetype-gl/vertex-buffer.h rename to freetype-gl/vertex-buffer.h diff --git a/generate-dynamic-header.js b/generate-dynamic-header.js index ba4e377d..c8dbf2ad 100644 --- a/generate-dynamic-header.js +++ b/generate-dynamic-header.js @@ -44,7 +44,7 @@ for (var clz in full_class_table) { var source = ` #include "dynamic.gen.hpp" -#include "../common.h" +#include "common.hpp" namespace client_classes { diff --git a/src/imgui/LICENSE b/imgui/LICENSE similarity index 100% rename from src/imgui/LICENSE rename to imgui/LICENSE diff --git a/src/imgui/README.md b/imgui/README.md similarity index 100% rename from src/imgui/README.md rename to imgui/README.md diff --git a/src/imgui/imconfig.h b/imgui/imconfig.h similarity index 100% rename from src/imgui/imconfig.h rename to imgui/imconfig.h diff --git a/src/imgui/imgui.cpp b/imgui/imgui.cpp similarity index 100% rename from src/imgui/imgui.cpp rename to imgui/imgui.cpp diff --git a/src/imgui/imgui.h b/imgui/imgui.h similarity index 100% rename from src/imgui/imgui.h rename to imgui/imgui.h diff --git a/src/imgui/imgui_demo.cpp b/imgui/imgui_demo.cpp similarity index 100% rename from src/imgui/imgui_demo.cpp rename to imgui/imgui_demo.cpp diff --git a/src/imgui/imgui_draw.cpp b/imgui/imgui_draw.cpp similarity index 100% rename from src/imgui/imgui_draw.cpp rename to imgui/imgui_draw.cpp diff --git a/src/imgui/imgui_impl_sdl.cpp b/imgui/imgui_impl_sdl.cpp similarity index 100% rename from src/imgui/imgui_impl_sdl.cpp rename to imgui/imgui_impl_sdl.cpp diff --git a/src/imgui/imgui_impl_sdl.h b/imgui/imgui_impl_sdl.h similarity index 100% rename from src/imgui/imgui_impl_sdl.h rename to imgui/imgui_impl_sdl.h diff --git a/src/imgui/imgui_internal.h b/imgui/imgui_internal.h similarity index 100% rename from src/imgui/imgui_internal.h rename to imgui/imgui_internal.h diff --git a/src/imgui/stb_rect_pack.h b/imgui/stb_rect_pack.h similarity index 100% rename from src/imgui/stb_rect_pack.h rename to imgui/stb_rect_pack.h diff --git a/src/imgui/stb_textedit.h b/imgui/stb_textedit.h similarity index 100% rename from src/imgui/stb_textedit.h rename to imgui/stb_textedit.h diff --git a/src/imgui/stb_truetype.h b/imgui/stb_truetype.h similarity index 100% rename from src/imgui/stb_truetype.h rename to imgui/stb_truetype.h diff --git a/src/CDumper.h b/include/CDumper.hpp similarity index 91% rename from src/CDumper.h rename to include/CDumper.hpp index ab6d62bc..282d74a9 100644 --- a/src/CDumper.h +++ b/include/CDumper.hpp @@ -5,18 +5,17 @@ * Author: nullifiedcat */ -#ifndef CDUMPER_H_ -#define CDUMPER_H_ +#ifndef CDUMPER_HPP_ +#define CDUMPER_HPP_ -#include "beforecheaders.h" +#include +#include #include #include -#include "aftercheaders.h" - -#include "logging.h" -#include "fixsdk.h" #include #include +#include +#include class CDumper { public: @@ -102,4 +101,4 @@ private: }; -#endif /* CDUMPER_H_ */ +#endif /* CDUMPER_HPP_ */ diff --git a/src/EffectChams.hpp b/include/EffectChams.hpp similarity index 93% rename from src/EffectChams.hpp rename to include/EffectChams.hpp index a55fa069..9318649e 100644 --- a/src/EffectChams.hpp +++ b/include/EffectChams.hpp @@ -8,7 +8,9 @@ #ifndef EFFECTCHAMS_HPP_ #define EFFECTCHAMS_HPP_ -#include "common.h" +#include "common.hpp" +#include "sdk/ScreenSpaceEffects.h" +#include "sdk.hpp" namespace effect_chams { diff --git a/src/EffectGlow.hpp b/include/EffectGlow.hpp similarity index 94% rename from src/EffectGlow.hpp rename to include/EffectGlow.hpp index 8aaff663..f2b757cd 100644 --- a/src/EffectGlow.hpp +++ b/include/EffectGlow.hpp @@ -8,9 +8,8 @@ #ifndef EFFECTGLOW_HPP_ #define EFFECTGLOW_HPP_ -#include "common.h" -#include "sdk/ScreenSpaceEffects.h" -#include "sdk.h" +#include "common.hpp" +#include "sdk.hpp" namespace effect_glow { diff --git a/src/aftercheaders.h b/include/aftercheaders.hpp similarity index 100% rename from src/aftercheaders.h rename to include/aftercheaders.hpp diff --git a/src/angles.hpp b/include/angles.hpp similarity index 97% rename from src/angles.hpp rename to include/angles.hpp index 7aed4db9..6398e5f6 100644 --- a/src/angles.hpp +++ b/include/angles.hpp @@ -7,8 +7,8 @@ #pragma once -#include "common.h" -#include "logging.h" +#include +#include "common.hpp" namespace angles { diff --git a/src/atlas.hpp b/include/atlas.hpp similarity index 100% rename from src/atlas.hpp rename to include/atlas.hpp diff --git a/src/averager.hpp b/include/averager.hpp similarity index 100% rename from src/averager.hpp rename to include/averager.hpp diff --git a/src/backpacktf.hpp b/include/backpacktf.hpp similarity index 100% rename from src/backpacktf.hpp rename to include/backpacktf.hpp diff --git a/src/base64.h b/include/base64.hpp similarity index 100% rename from src/base64.h rename to include/base64.hpp diff --git a/src/beforecheaders.h b/include/beforecheaders.hpp similarity index 100% rename from src/beforecheaders.h rename to include/beforecheaders.hpp diff --git a/src/catpackets.h b/include/catpackets.h similarity index 100% rename from src/catpackets.h rename to include/catpackets.h diff --git a/src/catsmclient.h b/include/catsmclient.h similarity index 100% rename from src/catsmclient.h rename to include/catsmclient.h diff --git a/src/chatlog.hpp b/include/chatlog.hpp similarity index 100% rename from src/chatlog.hpp rename to include/chatlog.hpp diff --git a/src/chatstack.h b/include/chatstack.hpp similarity index 75% rename from src/chatstack.h rename to include/chatstack.hpp index b9f6fbdb..6703e49d 100644 --- a/src/chatstack.h +++ b/include/chatstack.hpp @@ -5,16 +5,16 @@ * Author: nullifiedcat */ -#ifndef CHATSTACK_H_ -#define CHATSTACK_H_ +#ifndef CHATSTACK_HPP_ +#define CHATSTACK_HPP_ #define CHATSTACK_INTERVAL 0.8f -#include "beforecheaders.h" +#include #include #include #include -#include "aftercheaders.h" +#include namespace chat_stack { @@ -32,4 +32,4 @@ extern float last_say; } -#endif /* CHATSTACK_H_ */ +#endif /* CHATSTACK_HPP_ */ diff --git a/src/classinfo/classinfo.hpp b/include/classinfo/classinfo.hpp similarity index 97% rename from src/classinfo/classinfo.hpp rename to include/classinfo/classinfo.hpp index c74fb3b2..28050892 100644 --- a/src/classinfo/classinfo.hpp +++ b/include/classinfo/classinfo.hpp @@ -8,7 +8,7 @@ #ifndef CLASSINFO_HPP_ #define CLASSINFO_HPP_ -#include "../common.h" +#include "common.hpp" #include "dummy.gen.hpp" diff --git a/src/classinfo/css.gen.hpp b/include/classinfo/css.gen.hpp similarity index 100% rename from src/classinfo/css.gen.hpp rename to include/classinfo/css.gen.hpp diff --git a/src/classinfo/css_constexpr.gen.hpp b/include/classinfo/css_constexpr.gen.hpp similarity index 100% rename from src/classinfo/css_constexpr.gen.hpp rename to include/classinfo/css_constexpr.gen.hpp diff --git a/src/classinfo/dab.gen.hpp b/include/classinfo/dab.gen.hpp similarity index 100% rename from src/classinfo/dab.gen.hpp rename to include/classinfo/dab.gen.hpp diff --git a/src/classinfo/dab_constexpr.gen.hpp b/include/classinfo/dab_constexpr.gen.hpp similarity index 100% rename from src/classinfo/dab_constexpr.gen.hpp rename to include/classinfo/dab_constexpr.gen.hpp diff --git a/src/classinfo/dummy.gen.hpp b/include/classinfo/dummy.gen.hpp similarity index 100% rename from src/classinfo/dummy.gen.hpp rename to include/classinfo/dummy.gen.hpp diff --git a/src/classinfo/dump.hpp b/include/classinfo/dump.hpp similarity index 100% rename from src/classinfo/dump.hpp rename to include/classinfo/dump.hpp diff --git a/src/classinfo/dynamic.gen.hpp b/include/classinfo/dynamic.gen.hpp similarity index 100% rename from src/classinfo/dynamic.gen.hpp rename to include/classinfo/dynamic.gen.hpp diff --git a/src/classinfo/hl2dm.gen.hpp b/include/classinfo/hl2dm.gen.hpp similarity index 100% rename from src/classinfo/hl2dm.gen.hpp rename to include/classinfo/hl2dm.gen.hpp diff --git a/src/classinfo/hl2dm_constexpr.gen.hpp b/include/classinfo/hl2dm_constexpr.gen.hpp similarity index 100% rename from src/classinfo/hl2dm_constexpr.gen.hpp rename to include/classinfo/hl2dm_constexpr.gen.hpp diff --git a/src/classinfo/tf2.gen.hpp b/include/classinfo/tf2.gen.hpp similarity index 100% rename from src/classinfo/tf2.gen.hpp rename to include/classinfo/tf2.gen.hpp diff --git a/src/classinfo/tf2_constexpr.gen.hpp b/include/classinfo/tf2_constexpr.gen.hpp similarity index 100% rename from src/classinfo/tf2_constexpr.gen.hpp rename to include/classinfo/tf2_constexpr.gen.hpp diff --git a/src/classinfo/tf2c.gen.hpp b/include/classinfo/tf2c.gen.hpp similarity index 100% rename from src/classinfo/tf2c.gen.hpp rename to include/classinfo/tf2c.gen.hpp diff --git a/src/classinfo/tf2c_constexpr.gen.hpp b/include/classinfo/tf2c_constexpr.gen.hpp similarity index 100% rename from src/classinfo/tf2c_constexpr.gen.hpp rename to include/classinfo/tf2c_constexpr.gen.hpp diff --git a/src/colors.hpp b/include/colors.hpp similarity index 100% rename from src/colors.hpp rename to include/colors.hpp diff --git a/src/common.h b/include/common.hpp similarity index 70% rename from src/common.h rename to include/common.hpp index 7309ae32..d3bb8900 100644 --- a/src/common.h +++ b/include/common.hpp @@ -15,7 +15,7 @@ #endif -#include "beforecheaders.h" +#include #include #include #include @@ -33,11 +33,22 @@ #include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include "timer.hpp" #include "averager.hpp" +#include "segvcatch/segvcatch.h" -#include "aftercheaders.h" +#include #include "macros.hpp" #include "colors.hpp" @@ -49,7 +60,7 @@ extern "C" { } #include "ftrender.hpp" -#include "drawing.h" +#include "drawing.hpp" #include "fidgetspinner.hpp" #include DRAW_API #include "EffectGlow.hpp" @@ -59,50 +70,55 @@ extern "C" { #endif -#include "profiler.h" +#include "profiler.hpp" #include "offsets.hpp" -#include "entitycache.h" +#include #include "hoovy.hpp" -#include "enums.h" +#include #include "projlogging.hpp" #include "ucccccp_cmds.hpp" #include "velocity.hpp" #include "angles.hpp" #include "entityhitboxcache.hpp" #include "globals.h" -#include "helpers.h" +#include #include "playerlist.hpp" -#include "interfaces.h" -#include "localplayer.h" -#include "conditions.h" -#include "logging.h" -#include "targethelper.h" +#include +#include +#include +#include +#include #include "playerresource.h" -#include "usercmd.h" -#include "trace.h" -#include "cvwrapper.h" -#include "netvars.h" -#include "vfunc.h" -#include "hooks.h" -#include "prediction.h" -#include "conditions.h" -#include "itemtypes.h" -#include "chatstack.h" -#include "textfile.h" -#include "ipc.h" -#include "hooks/hookedmethods.h" +#include "usercmd.hpp" +#include "trace.hpp" +#include +#include "netvars.hpp" +#include "vfunc.hpp" +#include "hooks.hpp" +#include +#include +#include +#include +#include "textfile.hpp" +#include "ipc.hpp" +#include "hooks/hookedmethods.hpp" #include "classinfo/classinfo.hpp" -#include "crits.h" +#include "crits.hpp" #include "textmode.hpp" #include "backpacktf.hpp" +#include "sharedobj.hpp" +#include "init.hpp" + +#include "copypasted/Netvar.h" +#include "copypasted/CSignature.h" #if ENABLE_GUI -#include "gui/GUI.h" +#include "gui/GUI.hpp" #endif -#include "hacks/hacklist.h" +#include -#include "sdk.h" +#include template constexpr T _clamp(T _min, T _max, T _val) { diff --git a/src/conditions.h b/include/conditions.hpp similarity index 98% rename from src/conditions.h rename to include/conditions.hpp index 2717407a..7c608ac7 100644 --- a/src/conditions.h +++ b/include/conditions.hpp @@ -5,11 +5,11 @@ * Author: nullifiedcat */ -#ifndef CONDITIONS_H_ -#define CONDITIONS_H_ +#ifndef CONDITIONS_HPP_ +#define CONDITIONS_HPP_ -#include "netvars.h" -#include "entitycache.h" +#include +#include "netvars.hpp" #include "gameinfo.hpp" // So, tf2 actually stores cond netvars sequentionally, that's pretty good. @@ -279,4 +279,4 @@ inline void RemoveCondition(CachedEntity* ent) { CondBitSet(CE_VAR(ent, netvar.iCond, condition_data_s)); } -#endif /* CONDITIONS_H_ */ +#endif /* CONDITIONS_HPP_ */ diff --git a/src/copypasted/CSignature.h b/include/copypasted/CSignature.h similarity index 100% rename from src/copypasted/CSignature.h rename to include/copypasted/CSignature.h diff --git a/src/copypasted/Netvar.h b/include/copypasted/Netvar.h similarity index 99% rename from src/copypasted/Netvar.h rename to include/copypasted/Netvar.h index 57a1c2a0..37631733 100644 --- a/src/copypasted/Netvar.h +++ b/include/copypasted/Netvar.h @@ -4,7 +4,7 @@ //#include #include #include -#include "../logging.h" +#include "logging.hpp" // this and the cpp are creds to "Altimor" diff --git a/src/crits.h b/include/crits.hpp similarity index 87% rename from src/crits.h rename to include/crits.hpp index f6301341..7ebeaf82 100644 --- a/src/crits.h +++ b/include/crits.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef CRITS_H_ -#define CRITS_H_ +#ifndef CRITS_HPP_ +#define CRITS_HPP_ class CUserCmd; class IClientEntity; @@ -35,9 +35,9 @@ void ResetCritHack(); void LoadSavedState(); void ModifyCommandNumber(); -#include "beforecheaders.h" +#include #include -#include "aftercheaders.h" +#include class CatVar; extern CatVar experimental_crit_hack; @@ -47,4 +47,4 @@ extern std::unordered_map command_number_mod; //bool CalcIsAttackCritical(IClientEntity* weapon); -#endif /* CRITS_H_ */ +#endif /* CRITS_HPP_ */ diff --git a/src/cvwrapper.h b/include/cvwrapper.hpp similarity index 95% rename from src/cvwrapper.h rename to include/cvwrapper.hpp index de4ca1d6..807a579a 100644 --- a/src/cvwrapper.h +++ b/include/cvwrapper.hpp @@ -5,19 +5,19 @@ * Author: nullifiedcat */ -#ifndef CVWRAPPER_H_ -#define CVWRAPPER_H_ +#ifndef CVWRAPPER_HPP_ +#define CVWRAPPER_HPP_ class ConVar; -#include "sdk.h" -#include "interfaces.h" +#include +#include -#include "beforecheaders.h" +#include #include #include #include -#include "aftercheaders.h" +#include // Catvar types enum CatVar_t { @@ -140,4 +140,4 @@ void RegisterCatCommands(); void RegisterCatVars(); int GetRebasedCatVarCount(); -#endif /* CVWRAPPER_H_ */ +#endif /* CVWRAPPER_HPP_ */ diff --git a/src/drawex.hpp b/include/drawex.hpp similarity index 100% rename from src/drawex.hpp rename to include/drawex.hpp diff --git a/src/drawgl.hpp b/include/drawgl.hpp similarity index 98% rename from src/drawgl.hpp rename to include/drawgl.hpp index 163b1d13..b67a04f3 100644 --- a/src/drawgl.hpp +++ b/include/drawgl.hpp @@ -8,7 +8,7 @@ #ifndef DRAWGL_HPP_ #define DRAWGL_HPP_ -#include "drawing.h" +#include #define draw_api drawgl diff --git a/src/drawing.h b/include/drawing.hpp similarity index 92% rename from src/drawing.h rename to include/drawing.hpp index bcb51e28..e38d861b 100644 --- a/src/drawing.h +++ b/include/drawing.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef DRAWING_H_ -#define DRAWING_H_ +#ifndef DRAWING_HPP_ +#define DRAWING_HPP_ #if defined(RENDERING_ENGINE_OPENGL) #define DRAW_API "drawgl.hpp" @@ -14,7 +14,7 @@ #define DRAW_API "drawex.hpp" #endif -#include "common.h" +#include "common.hpp" extern "C" { #include @@ -62,4 +62,4 @@ constexpr rgba_t GUIColor() { } #endif -#endif /* DRAWING_H_ */ +#endif /* DRAWING_HPP_ */ diff --git a/src/drawmgr.hpp b/include/drawmgr.hpp similarity index 82% rename from src/drawmgr.hpp rename to include/drawmgr.hpp index f4b72c35..d67003ea 100644 --- a/src/drawmgr.hpp +++ b/include/drawmgr.hpp @@ -8,9 +8,9 @@ #ifndef DRAWMGR_HPP_ #define DRAWMGR_HPP_ -#include "beforecheaders.h" +#include "beforecheaders.hpp" #include -#include "aftercheaders.h" +#include "aftercheaders.hpp" extern std::mutex drawing_mutex; diff --git a/src/entitycache.h b/include/entitycache.hpp similarity index 93% rename from src/entitycache.h rename to include/entitycache.hpp index def67f51..be90c3d2 100644 --- a/src/entitycache.h +++ b/include/entitycache.hpp @@ -5,24 +5,22 @@ * Author: nullifiedcat */ -#ifndef ENTITYCACHE_H_ -#define ENTITYCACHE_H_ +#ifndef ENTITYCACHE_HPP_ +#define ENTITYCACHE_HPP_ -#include "enums.h" -#include "itemtypes.h" -#include "interfaces.h" +#include +#include #include "entityhitboxcache.hpp" -#include "fixsdk.h" - -#include "beforecheaders.h" #include "averager.hpp" -#include "aftercheaders.h" - #include #include #include #include #include +#include +#include +#include +#include struct matrix3x4_t; @@ -134,4 +132,4 @@ extern int max; } -#endif /* ENTITYCACHE_H_ */ +#endif /* ENTITYCACHE_HPP_ */ diff --git a/src/entityhitboxcache.hpp b/include/entityhitboxcache.hpp similarity index 98% rename from src/entityhitboxcache.hpp rename to include/entityhitboxcache.hpp index ce491268..20e1758a 100644 --- a/src/entityhitboxcache.hpp +++ b/include/entityhitboxcache.hpp @@ -8,11 +8,10 @@ #ifndef ENTITYHITBOXCACHE_HPP_ #define ENTITYHITBOXCACHE_HPP_ -#include "entitycache.h" - #include #include #include +#include #include #define CACHE_MAX_HITBOXES 64 diff --git a/src/enums.h b/include/enums.hpp similarity index 95% rename from src/enums.h rename to include/enums.hpp index 40f73747..2b4bee37 100644 --- a/src/enums.h +++ b/include/enums.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef ENUMS_H_ -#define ENUMS_H_ +#ifndef ENUMS_HPP_ +#define ENUMS_HPP_ enum EntityType { ENTITY_GENERIC, @@ -97,4 +97,4 @@ enum hitbox_t { foot_R = 17 }; -#endif /* ENUMS_H_ */ +#endif /* ENUMS_HPP_ */ diff --git a/src/fidgetspinner.hpp b/include/fidgetspinner.hpp similarity index 92% rename from src/fidgetspinner.hpp rename to include/fidgetspinner.hpp index b0d0bf15..aed256eb 100644 --- a/src/fidgetspinner.hpp +++ b/include/fidgetspinner.hpp @@ -7,7 +7,7 @@ #pragma once -#include "common.h" +#include "common.hpp" #include "atlas.hpp" class CatVar; diff --git a/src/fixsdk.h b/include/fixsdk.hpp similarity index 75% rename from src/fixsdk.h rename to include/fixsdk.hpp index 30eeaa27..54a5db9c 100644 --- a/src/fixsdk.h +++ b/include/fixsdk.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef FIXSDK_H_ -#define FIXSDK_H_ +#ifndef FIXSDK_HPP_ +#define FIXSDK_HPP_ /*#define LINUX 1 #define _LINUX 1 @@ -15,4 +15,4 @@ #define NO_MALLOC_OVERRIDE 1 #undef min*/ -#endif /* FIXSDK_H_ */ +#endif /* FIXSDK_HPP_ */ diff --git a/src/ftrender.hpp b/include/ftrender.hpp similarity index 96% rename from src/ftrender.hpp rename to include/ftrender.hpp index 92b42007..6e2acc0c 100644 --- a/src/ftrender.hpp +++ b/include/ftrender.hpp @@ -8,7 +8,7 @@ #ifndef FTRENDER_HPP_ #define FTRENDER_HPP_ -#include "common.h" +#include "common.hpp" extern "C" { #include diff --git a/src/gameinfo.hpp b/include/gameinfo.hpp similarity index 97% rename from src/gameinfo.hpp rename to include/gameinfo.hpp index df637a9b..d59e4f61 100644 --- a/src/gameinfo.hpp +++ b/include/gameinfo.hpp @@ -8,7 +8,7 @@ #ifndef GAMEINFO_HPP_ #define GAMEINFO_HPP_ -#include "common.h" +#include "common.hpp" #ifdef BUILD_GAME diff --git a/src/globals.h b/include/globals.h similarity index 100% rename from src/globals.h rename to include/globals.h diff --git a/src/gui/GUI.h b/include/gui/GUI.hpp similarity index 89% rename from src/gui/GUI.h rename to include/gui/GUI.hpp index d9b36758..57d2d2cd 100644 --- a/src/gui/GUI.h +++ b/include/gui/GUI.hpp @@ -5,13 +5,13 @@ * Author: nullifiedcat */ -#ifndef GUI_H_ -#define GUI_H_ +#ifndef GUI_HPP_ +#define GUI_HPP_ class IWidget; class CatVar; -#include "../common.h" +#include "common.hpp" extern CatVar gui_color_r; extern CatVar gui_color_g; @@ -45,4 +45,4 @@ public: extern CatGUI* g_pGUI; -#endif /* GUI_H_ */ +#endif /* GUI_HPP_ */ diff --git a/src/gui/im/Im.hpp b/include/gui/im/Im.hpp similarity index 100% rename from src/gui/im/Im.hpp rename to include/gui/im/Im.hpp diff --git a/src/gui/im/InfoPanel.hpp b/include/gui/im/InfoPanel.hpp similarity index 100% rename from src/gui/im/InfoPanel.hpp rename to include/gui/im/InfoPanel.hpp diff --git a/src/gui/im/Playerlist.hpp b/include/gui/im/Playerlist.hpp similarity index 100% rename from src/gui/im/Playerlist.hpp rename to include/gui/im/Playerlist.hpp diff --git a/src/gui/im/Schema.hpp b/include/gui/im/Schema.hpp similarity index 100% rename from src/gui/im/Schema.hpp rename to include/gui/im/Schema.hpp diff --git a/src/gui/ncc/Background.hpp b/include/gui/ncc/Background.hpp similarity index 100% rename from src/gui/ncc/Background.hpp rename to include/gui/ncc/Background.hpp diff --git a/src/gui/ncc/CritIndicator.hpp b/include/gui/ncc/CritIndicator.hpp similarity index 100% rename from src/gui/ncc/CritIndicator.hpp rename to include/gui/ncc/CritIndicator.hpp diff --git a/src/hack.h b/include/hack.hpp similarity index 91% rename from src/hack.h rename to include/hack.hpp index 26648dca..521ddffb 100644 --- a/src/hack.h +++ b/include/hack.hpp @@ -15,11 +15,11 @@ class bf_read; class ConCommand; class CCommand; -#include "beforecheaders.h" +#include #include #include #include -#include "aftercheaders.h" +#include namespace hack { diff --git a/src/hacks/Achievement.h b/include/hacks/Achievement.hpp similarity index 64% rename from src/hacks/Achievement.h rename to include/hacks/Achievement.hpp index 3968c75f..77718a3c 100644 --- a/src/hacks/Achievement.h +++ b/include/hacks/Achievement.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef HACKS_ACHIEVEMENT_H_ -#define HACKS_ACHIEVEMENT_H_ +#ifndef HACKS_ACHIEVEMENT_HPP_ +#define HACKS_ACHIEVEMENT_HPP_ namespace hacks { namespace tf2 { namespace achievement { @@ -15,4 +15,4 @@ void Unlock(); }}} -#endif /* HACKS_ACHIEVEMENT_H_ */ +#endif /* HACKS_ACHIEVEMENT_HPP_ */ diff --git a/src/hacks/Aimbot.h b/include/hacks/Aimbot.hpp similarity index 98% rename from src/hacks/Aimbot.h rename to include/hacks/Aimbot.hpp index 5a5e6909..fe7680dc 100644 --- a/src/hacks/Aimbot.h +++ b/include/hacks/Aimbot.hpp @@ -8,7 +8,7 @@ #ifndef HAIMBOT_H_ #define HAIMBOT_H_ -#include "../common.h" +#include "common.hpp" class ConVar; class IClientEntity; diff --git a/src/hacks/AntiAim.h b/include/hacks/AntiAim.hpp similarity index 100% rename from src/hacks/AntiAim.h rename to include/hacks/AntiAim.hpp diff --git a/src/hacks/AntiBackstab.hpp b/include/hacks/AntiBackstab.hpp similarity index 100% rename from src/hacks/AntiBackstab.hpp rename to include/hacks/AntiBackstab.hpp diff --git a/src/hacks/AntiCheat.hpp b/include/hacks/AntiCheat.hpp similarity index 72% rename from src/hacks/AntiCheat.hpp rename to include/hacks/AntiCheat.hpp index 46f02fc9..c42bab05 100644 --- a/src/hacks/AntiCheat.hpp +++ b/include/hacks/AntiCheat.hpp @@ -8,9 +8,12 @@ #pragma once -#include "../beforecheaders.h" -#include -#include "../aftercheaders.h" +#include "common.hpp" + +#include "ac/aimbot.hpp" +#include "ac/antiaim.hpp" +#include "ac/removecond.hpp" +#include "ac/bhop.hpp" namespace hacks { namespace shared { namespace anticheat { diff --git a/src/hacks/AntiDisguise.h b/include/hacks/AntiDisguise.hpp similarity index 60% rename from src/hacks/AntiDisguise.h rename to include/hacks/AntiDisguise.hpp index 8c8017a1..cd20941b 100644 --- a/src/hacks/AntiDisguise.h +++ b/include/hacks/AntiDisguise.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_ANTIDISGUISE_H_ -#define HACKS_ANTIDISGUISE_H_ +#ifndef HACKS_ANTIDISGUISE_HPP_ +#define HACKS_ANTIDISGUISE_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace antidisguise { @@ -18,4 +18,4 @@ void Draw(); }}} -#endif /* HACKS_ANTIDISGUISE_H_ */ +#endif /* HACKS_ANTIDISGUISE_HPP_ */ diff --git a/src/hacks/AutoBackstab.hpp b/include/hacks/AutoBackstab.hpp similarity index 100% rename from src/hacks/AutoBackstab.hpp rename to include/hacks/AutoBackstab.hpp diff --git a/src/hacks/AutoHeal.h b/include/hacks/AutoHeal.hpp similarity index 84% rename from src/hacks/AutoHeal.h rename to include/hacks/AutoHeal.hpp index dd0eceab..611faf3c 100644 --- a/src/hacks/AutoHeal.h +++ b/include/hacks/AutoHeal.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_AUTOHEAL_H_ -#define HACKS_AUTOHEAL_H_ +#ifndef HACKS_AUTOHEAL_HPP_ +#define HACKS_AUTOHEAL_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autoheal { @@ -33,4 +33,4 @@ bool CanHeal(int idx); }}} -#endif /* HACKS_AUTOHEAL_H_ */ +#endif /* HACKS_AUTOHEAL_HPP_ */ diff --git a/src/hacks/AutoJoin.hpp b/include/hacks/AutoJoin.hpp similarity index 100% rename from src/hacks/AutoJoin.hpp rename to include/hacks/AutoJoin.hpp diff --git a/src/hacks/AutoReflect.h b/include/hacks/AutoReflect.hpp similarity index 74% rename from src/hacks/AutoReflect.h rename to include/hacks/AutoReflect.hpp index f23544e5..2775a5c9 100644 --- a/src/hacks/AutoReflect.h +++ b/include/hacks/AutoReflect.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_AUTOREFLECT_H_ -#define HACKS_AUTOREFLECT_H_ +#ifndef HACKS_AUTOREFLECT_HPP_ +#define HACKS_AUTOREFLECT_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autoreflect { @@ -23,4 +23,4 @@ bool IsEntStickyBomb(CachedEntity* ent); }}} -#endif /* HACKS_AUTOREFLECT_H_ */ +#endif /* HACKS_AUTOREFLECT_HPP_ */ diff --git a/src/hacks/AutoSticky.h b/include/hacks/AutoSticky.hpp similarity index 70% rename from src/hacks/AutoSticky.h rename to include/hacks/AutoSticky.hpp index b3a60562..76422d2b 100644 --- a/src/hacks/AutoSticky.h +++ b/include/hacks/AutoSticky.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_AUTOSTICKY_H_ -#define HACKS_AUTOSTICKY_H_ +#ifndef HACKS_AUTOSTICKY_HPP_ +#define HACKS_AUTOSTICKY_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autosticky { @@ -21,4 +21,4 @@ void CreateMove(); }}} -#endif /* HACKS_AUTOSTICKY_H_ */ +#endif /* HACKS_AUTOSTICKY_HPP_ */ diff --git a/src/hacks/AutoTaunt.hpp b/include/hacks/AutoTaunt.hpp similarity index 100% rename from src/hacks/AutoTaunt.hpp rename to include/hacks/AutoTaunt.hpp diff --git a/src/hacks/Bunnyhop.h b/include/hacks/Bunnyhop.hpp similarity index 91% rename from src/hacks/Bunnyhop.h rename to include/hacks/Bunnyhop.hpp index 984ebd37..0282f31a 100644 --- a/src/hacks/Bunnyhop.h +++ b/include/hacks/Bunnyhop.hpp @@ -8,7 +8,7 @@ #ifndef HBUNNYHOP_H_ #define HBUNNYHOP_H_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace shared { namespace bunnyhop { diff --git a/src/hacks/ESP.h b/include/hacks/ESP.hpp similarity index 86% rename from src/hacks/ESP.h rename to include/hacks/ESP.hpp index 73397f3e..453e8310 100644 --- a/src/hacks/ESP.h +++ b/include/hacks/ESP.hpp @@ -8,17 +8,7 @@ #ifndef HESP_H_ #define HESP_H_ -#include "../common.h" - -class ConVar; -class CachedEntity; - -#include "../sdk.h" // VECTOR - -#include "../beforecheaders.h" -#include -#include -#include "../aftercheaders.h" +#include "common.hpp" namespace hacks { namespace shared { namespace esp { diff --git a/src/hacks/FollowBot.h b/include/hacks/FollowBot.hpp similarity index 84% rename from src/hacks/FollowBot.h rename to include/hacks/FollowBot.hpp index 9607d1ad..ec652585 100644 --- a/src/hacks/FollowBot.h +++ b/include/hacks/FollowBot.hpp @@ -5,17 +5,11 @@ * Author: nullifiedcat */ +#pragma once + #if ENABLE_IPC == 1 -#ifndef HACKS_FOLLOWBOT_H_ -#define HACKS_FOLLOWBOT_H_ - -class CatCommand; -class CatVar; -class CachedEntity; -class Vector; - -#include "../ipc.h" +#include "common.hpp" namespace hacks { namespace shared { namespace followbot { @@ -50,6 +44,4 @@ void SelectEntity(int idx); }}} -#endif /* HACKS_FOLLOWBOT_H_ */ - #endif diff --git a/src/hacks/HealArrows.hpp b/include/hacks/HealArrows.hpp similarity index 100% rename from src/hacks/HealArrows.hpp rename to include/hacks/HealArrows.hpp diff --git a/src/hacks/KillSay.h b/include/hacks/KillSay.hpp similarity index 83% rename from src/hacks/KillSay.h rename to include/hacks/KillSay.hpp index 94028489..449b022f 100644 --- a/src/hacks/KillSay.h +++ b/include/hacks/KillSay.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_KILLSAY_H_ -#define HACKS_KILLSAY_H_ +#ifndef HACKS_KILLSAY_HPP_ +#define HACKS_KILLSAY_HPP_ -#include "../common.h" +#include "common.hpp" class CatCommand; @@ -30,4 +30,4 @@ extern const std::vector builtin_nonecore_mlg; }}} -#endif /* HACKS_KILLSAY_H_ */ +#endif /* HACKS_KILLSAY_HPP_ */ diff --git a/src/hacks/LagExploit.hpp b/include/hacks/LagExploit.hpp similarity index 94% rename from src/hacks/LagExploit.hpp rename to include/hacks/LagExploit.hpp index 2aef6837..618ca25b 100644 --- a/src/hacks/LagExploit.hpp +++ b/include/hacks/LagExploit.hpp @@ -8,7 +8,7 @@ #ifndef HACKS_LAGEXPLOIT_HPP_ #define HACKS_LAGEXPLOIT_HPP_ -#include "../common.h" +#include "common.hpp" // Idea from UC (instant bomb defuse thread) diff --git a/src/hacks/Misc.h b/include/hacks/Misc.hpp similarity index 94% rename from src/hacks/Misc.h rename to include/hacks/Misc.hpp index 7622d280..d32b1c46 100644 --- a/src/hacks/Misc.h +++ b/include/hacks/Misc.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_MISC_H_ -#define HACKS_MISC_H_ +#ifndef HACKS_MISC_HPP_ +#define HACKS_MISC_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace shared { namespace misc { @@ -89,4 +89,4 @@ void CC_Misc_Disconnect_VAC(); DECLARE_HACK_SINGLETON(Misc);*/ -#endif /* HACKS_MISC_H_ */ +#endif /* HACKS_MISC_HPP_ */ diff --git a/src/hacks/Noisemaker.h b/include/hacks/Noisemaker.hpp similarity index 62% rename from src/hacks/Noisemaker.h rename to include/hacks/Noisemaker.hpp index 666ca1a3..3d1c40d9 100644 --- a/src/hacks/Noisemaker.h +++ b/include/hacks/Noisemaker.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_NOISEMAKER_H_ -#define HACKS_NOISEMAKER_H_ +#ifndef HACKS_NOISEMAKER_HPP_ +#define HACKS_NOISEMAKER_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace noisemaker { @@ -18,4 +18,4 @@ void CreateMove(); }}} -#endif /* HACKS_NOISEMAKER_H_ */ +#endif /* HACKS_NOISEMAKER_HPP_ */ diff --git a/src/hacks/Radar.hpp b/include/hacks/Radar.hpp similarity index 96% rename from src/hacks/Radar.hpp rename to include/hacks/Radar.hpp index 315da0de..bd01ffd4 100644 --- a/src/hacks/Radar.hpp +++ b/include/hacks/Radar.hpp @@ -8,7 +8,7 @@ #ifndef HACKS_RADAR_HPP_ #define HACKS_RADAR_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace radar { diff --git a/src/hacks/SkinChanger.hpp b/include/hacks/SkinChanger.hpp similarity index 99% rename from src/hacks/SkinChanger.hpp rename to include/hacks/SkinChanger.hpp index 8e305ea0..c26d8313 100644 --- a/src/hacks/SkinChanger.hpp +++ b/include/hacks/SkinChanger.hpp @@ -8,7 +8,7 @@ #ifndef HACKS_SKINCHANGER_HPP_ #define HACKS_SKINCHANGER_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace skinchanger { diff --git a/src/hacks/Spam.h b/include/hacks/Spam.hpp similarity index 86% rename from src/hacks/Spam.h rename to include/hacks/Spam.hpp index 8b94c7a4..e6b11b2b 100644 --- a/src/hacks/Spam.h +++ b/include/hacks/Spam.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_SPAM_H_ -#define HACKS_SPAM_H_ +#ifndef HACKS_SPAM_HPP_ +#define HACKS_SPAM_HPP_ -#include "../common.h" +#include "common.hpp" class CatCommand; @@ -31,4 +31,4 @@ void Reload(); }}} -#endif /* HACKS_SPAM_H_ */ +#endif /* HACKS_SPAM_HPP_ */ diff --git a/src/hacks/SpyAlert.h b/include/hacks/SpyAlert.hpp similarity index 68% rename from src/hacks/SpyAlert.h rename to include/hacks/SpyAlert.hpp index 4970c5d2..e946c753 100644 --- a/src/hacks/SpyAlert.h +++ b/include/hacks/SpyAlert.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef HACKS_SPYALERT_H_ -#define HACKS_SPYALERT_H_ +#ifndef HACKS_SPYALERT_HPP_ +#define HACKS_SPYALERT_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace spyalert { @@ -20,4 +20,4 @@ void Draw(); }}} -#endif /* HACKS_SPYALERT_H_ */ +#endif /* HACKS_SPYALERT_HPP_ */ diff --git a/src/hacks/Trigger.h b/include/hacks/Trigger.hpp similarity index 95% rename from src/hacks/Trigger.h rename to include/hacks/Trigger.hpp index 317a6b8b..6b369c28 100644 --- a/src/hacks/Trigger.h +++ b/include/hacks/Trigger.hpp @@ -8,7 +8,7 @@ #ifndef HTRIGGER_H_ #define HTRIGGER_H_ -#include "../common.h" +#include "common.hpp" class CatVar; diff --git a/src/hacks/UberSpam.hpp b/include/hacks/UberSpam.hpp similarity index 94% rename from src/hacks/UberSpam.hpp rename to include/hacks/UberSpam.hpp index bb3a93e9..78a90927 100644 --- a/src/hacks/UberSpam.hpp +++ b/include/hacks/UberSpam.hpp @@ -8,7 +8,7 @@ #ifndef HACKS_UBERSPAM_HPP_ #define HACKS_UBERSPAM_HPP_ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf { namespace uberspam { diff --git a/src/hacks/Walkbot.hpp b/include/hacks/Walkbot.hpp similarity index 100% rename from src/hacks/Walkbot.hpp rename to include/hacks/Walkbot.hpp diff --git a/src/hacks/ac/aimbot.hpp b/include/hacks/ac/aimbot.hpp similarity index 100% rename from src/hacks/ac/aimbot.hpp rename to include/hacks/ac/aimbot.hpp diff --git a/src/hacks/ac/antiaim.hpp b/include/hacks/ac/antiaim.hpp similarity index 100% rename from src/hacks/ac/antiaim.hpp rename to include/hacks/ac/antiaim.hpp diff --git a/src/hacks/ac/bhop.hpp b/include/hacks/ac/bhop.hpp similarity index 100% rename from src/hacks/ac/bhop.hpp rename to include/hacks/ac/bhop.hpp diff --git a/src/hacks/ac/removecond.hpp b/include/hacks/ac/removecond.hpp similarity index 100% rename from src/hacks/ac/removecond.hpp rename to include/hacks/ac/removecond.hpp diff --git a/include/hacks/hacklist.hpp b/include/hacks/hacklist.hpp new file mode 100644 index 00000000..42236d59 --- /dev/null +++ b/include/hacks/hacklist.hpp @@ -0,0 +1,44 @@ +/* + * hacklist.h + * + * Created on: Dec 18, 2016 + * Author: nullifiedcat + */ + +#ifndef HACKS_HACKLIST_HPP_ +#define HACKS_HACKLIST_HPP_ + +#if ENABLE_VISUALS == 1 + +#include "ESP.hpp" +#include "SkinChanger.hpp" +#include "Radar.hpp" +#include "SpyAlert.hpp" + +#endif + +#include "Aimbot.hpp" +#include "AntiAim.hpp" +#include "AntiDisguise.hpp" +#include "AutoHeal.hpp" +#include "AutoReflect.hpp" +#include "AutoSticky.hpp" +#include "AntiCheat.hpp" +#include "Bunnyhop.hpp" +#include "LagExploit.hpp" +#include "Walkbot.hpp" +#include "AutoJoin.hpp" +#include "AntiBackstab.hpp" +#include "AutoBackstab.hpp" +#include "FollowBot.hpp" +#include "HealArrows.hpp" +#include "Misc.hpp" +#include "Trigger.hpp" +#include "KillSay.hpp" +#include "UberSpam.hpp" +#include "Achievement.hpp" +#include "Spam.hpp" +#include "Noisemaker.hpp" +#include "FollowBot.hpp" + +#endif /* HACKS_HACKLIST_HPP_ */ diff --git a/src/headshake.hpp b/include/headshake.hpp similarity index 100% rename from src/headshake.hpp rename to include/headshake.hpp diff --git a/src/helpers.h b/include/helpers.hpp similarity index 94% rename from src/helpers.h rename to include/helpers.hpp index 81bddce3..6a106506 100644 --- a/src/helpers.h +++ b/include/helpers.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef HELPERS_H_ -#define HELPERS_H_ +#ifndef HELPERS_HPP_ +#define HELPERS_HPP_ class CachedEntity; class IClientEntity; @@ -24,18 +24,18 @@ void SetCVarInterface(ICvar* iface); #define RADPI 57.295779513082f //#define DEG2RAD(x) (float)(x) * (float)(PI / 180.0f) -#include "enums.h" -#include "conditions.h" -#include "entitycache.h" -#include "logging.h" +#include +#include +#include +#include -#include "beforecheaders.h" +#include #include #include #include -#include "aftercheaders.h" +#include -#include "sdk.h" +#include //typedef void ( *FnCommandCallback_t )( const CCommand &command ); @@ -160,4 +160,4 @@ std::string format(const Args&... args) { extern const std::string classes[10]; extern const char* powerups[POWERUP_COUNT]; -#endif /* HELPERS_H_ */ +#endif /* HELPERS_HPP_ */ diff --git a/src/hitrate.hpp b/include/hitrate.hpp similarity index 100% rename from src/hitrate.hpp rename to include/hitrate.hpp diff --git a/src/hooks.h b/include/hooks.hpp similarity index 100% rename from src/hooks.h rename to include/hooks.hpp diff --git a/src/hooks/CreateMove.h b/include/hooks/CreateMove.hpp similarity index 100% rename from src/hooks/CreateMove.h rename to include/hooks/CreateMove.hpp diff --git a/src/hooks/PaintTraverse.h b/include/hooks/PaintTraverse.hpp similarity index 100% rename from src/hooks/PaintTraverse.h rename to include/hooks/PaintTraverse.hpp diff --git a/src/hooks/hookedmethods.h b/include/hooks/hookedmethods.hpp similarity index 95% rename from src/hooks/hookedmethods.h rename to include/hooks/hookedmethods.hpp index 1e9fd042..276ffe67 100644 --- a/src/hooks/hookedmethods.h +++ b/include/hooks/hookedmethods.hpp @@ -8,7 +8,7 @@ #ifndef HOOKEDMETHODS_H_ #define HOOKEDMETHODS_H_ -#include "../common.h" +#include "common.hpp" typedef bool(*CreateMove_t)(void*, float, CUserCmd*); typedef void(*PaintTraverse_t)(void*, unsigned int, bool, bool); @@ -59,8 +59,8 @@ void DoSDLUnhooking(); #endif -#include "CreateMove.h" -#include "PaintTraverse.h" -#include "others.h" +#include "CreateMove.hpp" +#include "PaintTraverse.hpp" +#include "others.hpp" #endif /* HOOKEDMETHODS_H_ */ diff --git a/src/hooks/others.h b/include/hooks/others.hpp similarity index 100% rename from src/hooks/others.h rename to include/hooks/others.hpp diff --git a/src/hoovy.hpp b/include/hoovy.hpp similarity index 100% rename from src/hoovy.hpp rename to include/hoovy.hpp diff --git a/src/https_request.hpp b/include/https_request.hpp similarity index 90% rename from src/https_request.hpp rename to include/https_request.hpp index f56a7adc..3dc765ba 100644 --- a/src/https_request.hpp +++ b/include/https_request.hpp @@ -7,12 +7,12 @@ #pragma once +#include +#include #include #include -#include "beforecheaders.h" #include -#include "aftercheaders.h" namespace https { diff --git a/src/init.hpp b/include/init.hpp similarity index 78% rename from src/init.hpp rename to include/init.hpp index 92f6469f..8f788025 100644 --- a/src/init.hpp +++ b/include/init.hpp @@ -7,9 +7,9 @@ #pragma once -#include "beforecheaders.h" +#include +#include #include -#include "aftercheaders.h" std::stack& init_stack(); diff --git a/src/interfaces.h b/include/interfaces.hpp similarity index 92% rename from src/interfaces.h rename to include/interfaces.hpp index 1407c5c3..7f4874f9 100644 --- a/src/interfaces.h +++ b/include/interfaces.hpp @@ -5,14 +5,13 @@ * Author: nullifiedcat */ -#ifndef INTERFACES_H_ -#define INTERFACES_H_ +#ifndef INTERFACES_HPP_ +#define INTERFACES_HPP_ -#include "beforecheaders.h" +#include +#include +#include #include -#include "aftercheaders.h" - -#include "sharedobj.h" namespace vgui { class ISurface; @@ -86,4 +85,4 @@ extern IGameEventManager* g_IGameEventManager; void CreateInterfaces(); -#endif /* INTERFACES_H_ */ +#endif /* INTERFACES_HPP_ */ diff --git a/src/ipc.h b/include/ipc.hpp similarity index 96% rename from src/ipc.h rename to include/ipc.hpp index fdf7abbb..9aeb61ab 100644 --- a/src/ipc.h +++ b/include/ipc.hpp @@ -10,11 +10,11 @@ #ifndef IPC_H_ #define IPC_H_ -#include "beforecheaders.h" +#include #include "ipcb.hpp" #include "pthread.h" #include -#include "aftercheaders.h" +#include class CatCommand; class CatVar; diff --git a/src/itemtypes.h b/include/itemtypes.hpp similarity index 97% rename from src/itemtypes.h rename to include/itemtypes.hpp index d6d2913f..f422ef0f 100644 --- a/src/itemtypes.h +++ b/include/itemtypes.hpp @@ -5,14 +5,14 @@ * Author: nullifiedcat */ -#ifndef ITEMTYPES_H_ -#define ITEMTYPES_H_ +#ifndef ITEMTYPES_HPP_ +#define ITEMTYPES_HPP_ -#include "beforecheaders.h" +#include +#include #include #include #include -#include "aftercheaders.h" const std::string tf2c_weapon_names[] = { "BOTTLE", @@ -178,4 +178,4 @@ public: extern ItemManager g_ItemManager; -#endif /* ITEMTYPES_H_ */ +#endif /* ITEMTYPES_HPP_ */ diff --git a/src/json.hpp b/include/json.hpp similarity index 100% rename from src/json.hpp rename to include/json.hpp diff --git a/src/localplayer.h b/include/localplayer.hpp similarity index 87% rename from src/localplayer.h rename to include/localplayer.hpp index 240a7533..da1f3d46 100644 --- a/src/localplayer.h +++ b/include/localplayer.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef LOCALPLAYER_H_ -#define LOCALPLAYER_H_ +#ifndef LOCALPLAYER_HPP_ +#define LOCALPLAYER_HPP_ -#include "fixsdk.h" +#include #include class CachedEntity; @@ -44,4 +44,4 @@ public: extern LocalPlayer* g_pLocalPlayer; -#endif /* LOCALPLAYER_H_ */ +#endif /* LOCALPLAYER_HPP_ */ diff --git a/src/logging.h b/include/logging.hpp similarity index 82% rename from src/logging.h rename to include/logging.hpp index 24126c25..2b8354e7 100644 --- a/src/logging.h +++ b/include/logging.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef LOGGING_H_ -#define LOGGING_H_ +#ifndef LOGGING_HPP_ +#define LOGGING_HPP_ #include @@ -26,4 +26,4 @@ void Info(const char* fmt, ...); } #endif -#endif /* LOGGING_H_ */ +#endif /* LOGGING_HPP_ */ diff --git a/src/macros.hpp b/include/macros.hpp similarity index 100% rename from src/macros.hpp rename to include/macros.hpp diff --git a/src/netmessage.h b/include/netmessage.hpp similarity index 98% rename from src/netmessage.h rename to include/netmessage.hpp index 5974e373..e218c74b 100644 --- a/src/netmessage.h +++ b/include/netmessage.hpp @@ -5,11 +5,11 @@ * Author: nullifiedcat */ -#ifndef NETMESSAGE_H_ -#define NETMESSAGE_H_ +#ifndef NETMESSAGE_HPP_ +#define NETMESSAGE_HPP_ -#include "fixsdk.h" #include +#include #include #include #include @@ -240,4 +240,4 @@ private: }; -#endif /* NETMESSAGE_H_ */ +#endif /* NETMESSAGE_HPP_ */ diff --git a/src/netvars.h b/include/netvars.hpp similarity index 97% rename from src/netvars.h rename to include/netvars.hpp index c294d177..25e3d1c8 100644 --- a/src/netvars.h +++ b/include/netvars.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef NETVARS_H_ -#define NETVARS_H_ +#ifndef NETVARS_HPP_ +#define NETVARS_HPP_ -#include "logging.h" +#include class IClientEntity; @@ -143,4 +143,4 @@ public: extern NetVars netvar; -#endif /* NETVARS_H_ */ +#endif /* NETVARS_HPP_ */ diff --git a/src/offsets.hpp b/include/offsets.hpp similarity index 100% rename from src/offsets.hpp rename to include/offsets.hpp diff --git a/src/playerlist.hpp b/include/playerlist.hpp similarity index 98% rename from src/playerlist.hpp rename to include/playerlist.hpp index 992b76c1..de8e20f1 100644 --- a/src/playerlist.hpp +++ b/include/playerlist.hpp @@ -8,7 +8,7 @@ #ifndef PLAYERLIST_HPP_ #define PLAYERLIST_HPP_ -#include "common.h" +#include "common.hpp" namespace playerlist { diff --git a/src/playerresource.h b/include/playerresource.h similarity index 100% rename from src/playerresource.h rename to include/playerresource.h diff --git a/src/prediction.h b/include/prediction.hpp similarity index 88% rename from src/prediction.h rename to include/prediction.hpp index 21165252..a501e998 100644 --- a/src/prediction.h +++ b/include/prediction.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef PREDICTION_H_ -#define PREDICTION_H_ +#ifndef PREDICTION_HPP_ +#define PREDICTION_HPP_ -#include "enums.h" +#include class CachedEntity; class Vector; @@ -31,4 +31,4 @@ void Prediction_PaintTraverse(); float DistanceToGround(CachedEntity* ent); float DistanceToGround(Vector origin); -#endif /* PREDICTION_H_ */ +#endif /* PREDICTION_HPP_ */ diff --git a/src/profiler.h b/include/profiler.hpp similarity index 94% rename from src/profiler.h rename to include/profiler.hpp index a5c1661b..783c3274 100644 --- a/src/profiler.h +++ b/include/profiler.hpp @@ -8,10 +8,10 @@ #ifndef PROFILER_H_ #define PROFILER_H_ -#include "beforecheaders.h" +#include +#include #include #include -#include "aftercheaders.h" class ProfilerNode; diff --git a/src/projlogging.hpp b/include/projlogging.hpp similarity index 100% rename from src/projlogging.hpp rename to include/projlogging.hpp diff --git a/src/sconvars.hpp b/include/sconvars.hpp similarity index 94% rename from src/sconvars.hpp rename to include/sconvars.hpp index e4338185..7272dba2 100644 --- a/src/sconvars.hpp +++ b/include/sconvars.hpp @@ -8,7 +8,7 @@ #ifndef SCONVARS_HPP_ #define SCONVARS_HPP_ -#include "common.h" +#include "common.hpp" /* * HECK off F1ssi0N diff --git a/src/sdk.h b/include/sdk.hpp similarity index 92% rename from src/sdk.h rename to include/sdk.hpp index 1b370a9c..87338b97 100644 --- a/src/sdk.h +++ b/include/sdk.hpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ -#ifndef SDK_H_ -#define SDK_H_ +#ifndef SDK_HPP_ +#define SDK_HPP_ -#include "fixsdk.h" +#include #define private public #define protected public @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include "sdk/TFGCClientSystem.hpp" #include "sdk/in_buttons.h" @@ -63,4 +65,4 @@ #include "sdk/igamemovement.h" #include "sdk/HUD.h" -#endif /* SDK_H_ */ +#endif /* SDK_HPP_ */ diff --git a/src/sdk/HUD.h b/include/sdk/HUD.h similarity index 91% rename from src/sdk/HUD.h rename to include/sdk/HUD.h index 6610689a..0827abcb 100644 --- a/src/sdk/HUD.h +++ b/include/sdk/HUD.h @@ -7,10 +7,9 @@ #pragma once -#include "../logging.h" - +#include #include -#include "../vfunc.h" +#include "vfunc.hpp" class CHudBaseChat { public: diff --git a/src/sdk/ScreenSpaceEffects.h b/include/sdk/ScreenSpaceEffects.h similarity index 100% rename from src/sdk/ScreenSpaceEffects.h rename to include/sdk/ScreenSpaceEffects.h diff --git a/src/sdk/TFGCClientSystem.hpp b/include/sdk/TFGCClientSystem.hpp similarity index 100% rename from src/sdk/TFGCClientSystem.hpp rename to include/sdk/TFGCClientSystem.hpp diff --git a/src/sdk/igamemovement.h b/include/sdk/igamemovement.h similarity index 100% rename from src/sdk/igamemovement.h rename to include/sdk/igamemovement.h diff --git a/src/sdk/iinput.h b/include/sdk/iinput.h similarity index 100% rename from src/sdk/iinput.h rename to include/sdk/iinput.h diff --git a/src/sdk/imaterialsystemfixed.h b/include/sdk/imaterialsystemfixed.h similarity index 100% rename from src/sdk/imaterialsystemfixed.h rename to include/sdk/imaterialsystemfixed.h diff --git a/src/sdk/in_buttons.h b/include/sdk/in_buttons.h similarity index 100% rename from src/sdk/in_buttons.h rename to include/sdk/in_buttons.h diff --git a/src/sharedobj.h b/include/sharedobj.hpp similarity index 88% rename from src/sharedobj.h rename to include/sharedobj.hpp index 60a975a3..ad5c4399 100644 --- a/src/sharedobj.h +++ b/include/sharedobj.hpp @@ -5,13 +5,13 @@ * Author: nullifiedcat */ -#ifndef SHAREDOBJ_H_ -#define SHAREDOBJ_H_ +#ifndef SHAREDOBJ_HPP_ +#define SHAREDOBJ_HPP_ -#include "beforecheaders.h" +#include #include #include -#include "aftercheaders.h" +#include struct link_map; typedef void *(*fn_CreateInterface_t)(const char*, int*); @@ -54,4 +54,4 @@ void LoadAllSharedObjects(); } -#endif /* SHAREDOBJ_H_ */ +#endif /* SHAREDOBJ_HPP_ */ diff --git a/src/shmstream.h b/include/shmstream.h similarity index 100% rename from src/shmstream.h rename to include/shmstream.h diff --git a/src/targethelper.h b/include/targethelper.hpp similarity index 65% rename from src/targethelper.h rename to include/targethelper.hpp index 98c75734..add640f6 100644 --- a/src/targethelper.h +++ b/include/targethelper.hpp @@ -5,11 +5,11 @@ * Author: nullifiedcat */ -#ifndef TARGETHELPER_H_ -#define TARGETHELPER_H_ +#ifndef TARGETHELPER_HPP_ +#define TARGETHELPER_HPP_ class CachedEntity; int GetScoreForEntity(CachedEntity* entity); -#endif /* TARGETHELPER_H_ */ +#endif /* TARGETHELPER_HPP_ */ diff --git a/src/textfile.h b/include/textfile.hpp similarity index 72% rename from src/textfile.h rename to include/textfile.hpp index e9df7356..a2b3f3b7 100644 --- a/src/textfile.h +++ b/include/textfile.hpp @@ -5,13 +5,13 @@ * Author: nullifiedcat */ -#ifndef TEXTFILE_H_ -#define TEXTFILE_H_ +#ifndef TEXTFILE_HPP_ +#define TEXTFILE_HPP_ -#include "beforecheaders.h" +#include +#include #include #include -#include "aftercheaders.h" class TextFile { public: @@ -24,4 +24,4 @@ public: std::vector lines; }; -#endif /* TEXTFILE_H_ */ +#endif /* TEXTFILE_HPP_ */ diff --git a/src/textmode.hpp b/include/textmode.hpp similarity index 100% rename from src/textmode.hpp rename to include/textmode.hpp diff --git a/src/timer.hpp b/include/timer.hpp similarity index 100% rename from src/timer.hpp rename to include/timer.hpp diff --git a/src/trace.h b/include/trace.hpp similarity index 93% rename from src/trace.h rename to include/trace.hpp index d1205ec8..47b3d999 100644 --- a/src/trace.h +++ b/include/trace.hpp @@ -5,11 +5,11 @@ * Author: nullifiedcat */ -#ifndef TRACE_H_ -#define TRACE_H_ +#ifndef TRACE_HPP_ +#define TRACE_HPP_ -#include "fixsdk.h" #include +#include // This file is a mess. I need to fix it. TODO @@ -58,4 +58,4 @@ extern FilterPenetration filter_penetration; } -#endif /* TRACE_H_ */ +#endif /* TRACE_HPP_ */ diff --git a/src/ucccccp_cmds.hpp b/include/ucccccp_cmds.hpp similarity index 100% rename from src/ucccccp_cmds.hpp rename to include/ucccccp_cmds.hpp diff --git a/src/usercmd.h b/include/usercmd.hpp similarity index 83% rename from src/usercmd.h rename to include/usercmd.hpp index be6b9905..63592d15 100644 --- a/src/usercmd.h +++ b/include/usercmd.hpp @@ -5,12 +5,12 @@ * Author: nullifiedcat */ -#ifndef USERCMD_H_ -#define USERCMD_H_ +#ifndef USERCMD_HPP_ +#define USERCMD_HPP_ +#include #include -#include "fixsdk.h" #include class CUserCmd { @@ -32,4 +32,4 @@ public: bool hasbeenpredicted; }; -#endif /* USERCMD_H_ */ +#endif /* USERCMD_HPP_ */ diff --git a/src/velocity.hpp b/include/velocity.hpp similarity index 93% rename from src/velocity.hpp rename to include/velocity.hpp index e3524a78..f1e18d21 100644 --- a/src/velocity.hpp +++ b/include/velocity.hpp @@ -8,7 +8,7 @@ #ifndef VELOCITY_HPP_ #define VELOCITY_HPP_ -#include "common.h" +#include "common.hpp" namespace velocity { diff --git a/src/vfunc.h b/include/vfunc.hpp similarity index 82% rename from src/vfunc.h rename to include/vfunc.hpp index 0c1137f5..7e4a00d2 100644 --- a/src/vfunc.h +++ b/include/vfunc.hpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#ifndef VFUNC_H_ -#define VFUNC_H_ +#ifndef VFUNC_HPP_ +#define VFUNC_HPP_ template inline F vfunc(void* thisptr, uintptr_t idx, uintptr_t offset = 0) { @@ -14,4 +14,4 @@ inline F vfunc(void* thisptr, uintptr_t idx, uintptr_t offset = 0) { return reinterpret_cast((vmt)[idx]); } -#endif /* VFUNC_H_ */ +#endif /* VFUNC_HPP_ */ diff --git a/src/xorstring.hpp b/include/xorstring.hpp similarity index 100% rename from src/xorstring.hpp rename to include/xorstring.hpp diff --git a/src/xpcmutex.h b/include/xpcmutex.h similarity index 100% rename from src/xpcmutex.h rename to include/xpcmutex.h diff --git a/src/xshm.h b/include/xshm.h similarity index 100% rename from src/xshm.h rename to include/xshm.h diff --git a/makefile b/makefile index 45d64252..ff589d69 100644 --- a/makefile +++ b/makefile @@ -53,7 +53,7 @@ RES_DIR=res OUT_DIR=bin TARGET = $(OUT_DIR)/$(OUT_NAME) -INCLUDES=-Iucccccp -isystem/usr/include/c++/6.3.1 -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR) +INCLUDES=-I. -Iinclude -Iucccccp -isystem/usr/include/c++/6.3.1 -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR) LDLIBS=-static -l:libc.so.6 -l:libstdc++.so.6 -l:libtier0.so -l:libvstdlib.so LDFLAGS=-shared -L$(realpath $(LIB_DIR)) SOURCES=$(shell find $(SRC_DIR) -name "*.c*" -print) @@ -106,7 +106,7 @@ CXXFLAGS+=$(WARNING_FLAGS) endif ifeq ($(ENABLE_VISUALS),1) -INCLUDES+=-isystemsrc/freetype-gl -isystemsrc/imgui -isystem/usr/local/include/freetype2 -isystem/usr/include/freetype2 +INCLUDES+=-isystemfreetype-gl -isystemimgui -isystem/usr/local/include/freetype2 -isystem/usr/include/freetype2 LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -l:libfreetype.so CXXFLAGS+=$(shell sdl2-config --cflags) CFLAGS+=$(shell sdl2-config --cflags) @@ -115,8 +115,8 @@ EXCL_SOURCES:=drawex.cpp catpclient.c pipepacket.c hacks/ESP.cpp hacks/SkinChang EXCL_SOURCES:=$(addprefix $(SRC_DIR)/,$(EXCL_SOURCES)) SOURCES:=$(filter-out $(shell find $(SRC_DIR)/gui -name "*.cpp" -print),$(SOURCES)) -SOURCES:=$(filter-out $(shell find $(SRC_DIR)/freetype-gl -name "*.c*" -print),$(SOURCES)) -SOURCES:=$(filter-out $(shell find $(SRC_DIR)/imgui -name "*.c*" -print),$(SOURCES)) +SOURCES:=$(filter-out $(shell find freetype-gl -name "*.c*" -print),$(SOURCES)) +SOURCES:=$(filter-out $(shell find imgui -name "*.c*" -print),$(SOURCES)) SOURCES:=$(filter-out $(EXCL_SOURCES),$(SOURCES)) endif diff --git a/src/segvcatch/i386-signal.h b/segvcatch/i386-signal.h similarity index 100% rename from src/segvcatch/i386-signal.h rename to segvcatch/i386-signal.h diff --git a/src/segvcatch/segvcatch.cpp b/segvcatch/segvcatch.cpp similarity index 100% rename from src/segvcatch/segvcatch.cpp rename to segvcatch/segvcatch.cpp diff --git a/src/segvcatch/segvcatch.h b/segvcatch/segvcatch.h similarity index 100% rename from src/segvcatch/segvcatch.h rename to segvcatch/segvcatch.h diff --git a/src/segvcatch/x86_64-signal.h b/segvcatch/x86_64-signal.h similarity index 100% rename from src/segvcatch/x86_64-signal.h rename to segvcatch/x86_64-signal.h diff --git a/src/EffectChams.cpp b/src/EffectChams.cpp index c34e7ae8..8235739d 100644 --- a/src/EffectChams.cpp +++ b/src/EffectChams.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" #include "EffectChams.hpp" //static CatVar chams_experimental(CV_SWITCH, "chams_effect", "0", "Experimental Chams"); diff --git a/src/EffectGlow.cpp b/src/EffectGlow.cpp index 040a20ca..42601166 100644 --- a/src/EffectGlow.cpp +++ b/src/EffectGlow.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" #include "EffectGlow.hpp" IMaterialSystem* materials = nullptr; diff --git a/src/atlas.cpp b/src/atlas.cpp index c08737fb..a6ca9a29 100644 --- a/src/atlas.cpp +++ b/src/atlas.cpp @@ -7,10 +7,7 @@ #if ENABLE_VISUALS == 1 -#include "atlas.hpp" - -#include "drawing.h" -#include "logging.h" +#include "common.hpp" namespace textures { diff --git a/src/backpacktf.cpp b/src/backpacktf.cpp index fae5e8dd..ea70c2a5 100644 --- a/src/backpacktf.cpp +++ b/src/backpacktf.cpp @@ -9,9 +9,7 @@ #include "json.hpp" #include "https_request.hpp" -#include "common.h" - -#include "cvwrapper.h" +#include "common.hpp" #include #include diff --git a/src/chatlog.cpp b/src/chatlog.cpp index c785b48d..03a36907 100644 --- a/src/chatlog.cpp +++ b/src/chatlog.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" #include "init.hpp" #include diff --git a/src/chatstack.cpp b/src/chatstack.cpp index b73bab20..c159da75 100644 --- a/src/chatstack.cpp +++ b/src/chatstack.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "chatstack.h" -#include "common.h" -#include "sdk.h" +#include "common.hpp" namespace chat_stack { diff --git a/src/classinfo/classinfo.cpp b/src/classinfo/classinfo.cpp index 192b4266..34e8a1f8 100644 --- a/src/classinfo/classinfo.cpp +++ b/src/classinfo/classinfo.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "classinfo.hpp" +#include "classinfo/classinfo.hpp" client_classes::dummy* client_class_list = nullptr; diff --git a/src/classinfo/dump.cpp b/src/classinfo/dump.cpp index 89275607..581d6153 100644 --- a/src/classinfo/dump.cpp +++ b/src/classinfo/dump.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "dump.hpp" -#include "../common.h" - -static CatCommand do_dump("debug_dump_classes", "Dump classes", PerformClassDump); +#include "common.hpp" void PerformClassDump() { ClientClass* cc = g_IBaseClient->GetAllClasses(); @@ -22,6 +19,8 @@ void PerformClassDump() { } } +static CatCommand do_dump("debug_dump_classes", "Dump classes", PerformClassDump); + static CatCommand populate_dynamic("debug_populate_dynamic", "Populate dynamic class table", []() { client_classes::dynamic_list.Populate(); }); diff --git a/src/classinfo/dynamic.gen.cpp b/src/classinfo/dynamic.gen.cpp index 7efa3365..b96d1d9e 100644 --- a/src/classinfo/dynamic.gen.cpp +++ b/src/classinfo/dynamic.gen.cpp @@ -1,7 +1,7 @@ -#include "dynamic.gen.hpp" -#include "../common.h" +#include "classinfo/dynamic.gen.hpp" +#include "common.hpp" namespace client_classes { @@ -531,4 +531,4 @@ void dynamic::Populate() { dynamic dynamic_list; -} \ No newline at end of file +} diff --git a/src/colors.cpp b/src/colors.cpp index 284ef07a..08267ccb 100644 --- a/src/colors.cpp +++ b/src/colors.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" CatVar user_red_blue(CV_INT, "esp_color_red_b", "0", "Red Team: Blue", "Blue color for red team", 255); CatVar user_red_green(CV_INT, "esp_color_red_g", "0", "Red Team: Green", "Green color for red team", 255); diff --git a/src/conditions.cpp b/src/conditions.cpp index 1ecf82b3..58b30011 100644 --- a/src/conditions.cpp +++ b/src/conditions.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "conditions.h" -#include "common.h" +#include "common.hpp" static CatCommand dump_conditions("debug_conditions", "Shows conditions for entity #", [](const CCommand& args) { int id = atoi(args.Arg(1)); diff --git a/src/copypasted/CSignature.cpp b/src/copypasted/CSignature.cpp index 633150da..40a2a677 100644 --- a/src/copypasted/CSignature.cpp +++ b/src/copypasted/CSignature.cpp @@ -1,17 +1,7 @@ // Replace darkstorm stuff with my stuff //#include "SDK.h" -#include "../copypasted/CSignature.h" -#include "../logging.h" -#include "../sharedobj.h" -#include - -#include -#include -#include -#include - -#include +#include "common.hpp" #define INRANGE(x,a,b) (x >= a && x <= b) #define getBits( x ) (INRANGE((x&(~0x20)),'A','F') ? ((x&(~0x20)) - 'A' + 0xa) : (INRANGE(x,'0','9') ? x - '0' : 0)) diff --git a/src/copypasted/Netvar.cpp b/src/copypasted/Netvar.cpp index a3d80583..08e8db05 100644 --- a/src/copypasted/Netvar.cpp +++ b/src/copypasted/Netvar.cpp @@ -1,13 +1,4 @@ -#include "Netvar.h" - -#include "../interfaces.h" -#include "../logging.h" -#include - -#include "../fixsdk.h" -#include -#include -#include +#include "common.hpp" /** * netvar_tree - Constructor diff --git a/src/crits.cpp b/src/crits.cpp index cee614c5..5e13d6c4 100644 --- a/src/crits.cpp +++ b/src/crits.cpp @@ -5,13 +5,9 @@ * Author: nullifiedcat */ -#include "crits.h" -#include "common.h" -#include "sharedobj.h" -#include "copypasted/CSignature.h" +#include "common.hpp" #include - CatVar experimental_crit_hack(CV_KEY, "crit_hack_experimental", "0", "Unstable Crit Hack", "Experimental crit hack, use this **OR** old crit hack, do not use both!\nNEEDS NEXT CRIT INFO TO BE ACTIVE!"); std::unordered_map command_number_mod {}; diff --git a/src/cvwrapper.cpp b/src/cvwrapper.cpp index 6f93ef66..e1dcbe04 100644 --- a/src/cvwrapper.cpp +++ b/src/cvwrapper.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "cvwrapper.h" - -#include "common.h" -#include "sdk.h" +#include "common.hpp" int CatVar::last_id { 0 }; diff --git a/src/drawex.cpp b/src/drawex.cpp index deef79ef..b79766fc 100644 --- a/src/drawex.cpp +++ b/src/drawex.cpp @@ -5,10 +5,9 @@ * Author: nullifiedcat */ -#include "drawing.h" -#include "colors.hpp" -#include "drawex.hpp" -#include "hack.h" +#include "common.hpp" +#include "hack.hpp" + extern "C" { #include "catsmclient.h" diff --git a/src/drawgl.cpp b/src/drawgl.cpp index bb09ee0d..30c47f90 100644 --- a/src/drawgl.cpp +++ b/src/drawgl.cpp @@ -6,7 +6,7 @@ */ #include "drawgl.hpp" -#include "common.h" +#include "common.hpp" #include "atlas.hpp" extern "C" { diff --git a/src/drawing.cpp b/src/drawing.cpp index 5e86de4f..f162913a 100644 --- a/src/drawing.cpp +++ b/src/drawing.cpp @@ -7,9 +7,7 @@ #if ENABLE_VISUALS == 1 -#include "common.h" -#include "sdk.h" -#include "ftrender.hpp" +#include "common.hpp" #include diff --git a/src/drawmgr.cpp b/src/drawmgr.cpp index 5fb9e353..cf14cf80 100644 --- a/src/drawmgr.cpp +++ b/src/drawmgr.cpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#include "common.h" -#include "hack.h" +#include "common.hpp" +#include "hack.hpp" void BeginCheatVisuals() { #if RENDERING_ENGINE_OPENGL diff --git a/src/entitycache.cpp b/src/entitycache.cpp index 01478f3f..b2f01874 100644 --- a/src/entitycache.cpp +++ b/src/entitycache.cpp @@ -5,11 +5,9 @@ * Author: nullifiedcat */ -#include "common.h" -#include "sdk.h" +#include "common.hpp" #include -#include "profiler.h" // This method of const'ing the index is weird. CachedEntity::CachedEntity() : diff --git a/src/entityhitboxcache.cpp b/src/entityhitboxcache.cpp index 4fe4577e..dc50c5b2 100644 --- a/src/entityhitboxcache.cpp +++ b/src/entityhitboxcache.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" namespace hitbox_cache { diff --git a/src/entry.cpp b/src/entry.cpp index e773fbaa..cc9f820d 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -5,10 +5,10 @@ * Author: nullifiedcat */ +#include #include -#include "hack.h" -#include "logging.h" +#include "hack.hpp" pthread_mutex_t mutex_quit; pthread_t thread_main; diff --git a/src/ftrender.cpp b/src/ftrender.cpp index e9707b72..0bc422a2 100644 --- a/src/ftrender.cpp +++ b/src/ftrender.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" #ifdef RENDERING_ENGINE_OPENGL diff --git a/src/globals.cpp b/src/globals.cpp index 797b7db0..d06049da 100644 --- a/src/globals.cpp +++ b/src/globals.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" -#include "sdk.h" -#include "copypasted/CSignature.h" +#include "common.hpp" time_t time_injected { 0 }; diff --git a/src/gui/GUI.cpp b/src/gui/GUI.cpp index 44901895..f33c141e 100644 --- a/src/gui/GUI.cpp +++ b/src/gui/GUI.cpp @@ -7,7 +7,7 @@ #include "GUI.h" -#include "../common.h" +#include "common.hpp" #include "../sdk.h" void GUIVisibleCallback(IConVar* var, const char* pOldValue, float flOldValue) { diff --git a/src/gui/im/Schema.cpp b/src/gui/im/Schema.cpp index af5b7f42..77218697 100644 --- a/src/gui/im/Schema.cpp +++ b/src/gui/im/Schema.cpp @@ -5,12 +5,12 @@ * Author: nullifiedcat */ +#include #include "Schema.hpp" #include "../../helpers.h" #include "../../cvwrapper.h" -#include "../../logging.h" namespace menu { namespace im { diff --git a/src/hack.cpp b/src/hack.cpp index a620bdf1..0e634e34 100644 --- a/src/hack.cpp +++ b/src/hack.cpp @@ -5,37 +5,8 @@ * Author: nullifiedcat */ -#include "hack.h" - -#include "beforecheaders.h" -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include "segvcatch/segvcatch.h" -#include -#include -#include "aftercheaders.h" - -#include -#include -// All Hacks -#include "hacks/hacklist.h" - -#include "common.h" -#include "sharedobj.h" -#include "hooks.h" -#include "netmessage.h" -#include "profiler.h" -#include "cvwrapper.h" +#include "hack.hpp" +#include "common.hpp" #define STRINGIFY(x) #x #define TO_STRING(x) STRINGIFY(x) @@ -44,15 +15,8 @@ #include "ftrender.hpp" #endif -#include "hooks/hookedmethods.h" -#include "init.hpp" -#include "sdk.h" -#include "vfunc.h" -#include "copypasted/CSignature.h" -#include "copypasted/Netvar.h" -#include "CDumper.h" -#include +#include "CDumper.hpp" /* * Credits to josh33901 aka F1ssi0N for butifel F1Public and Darkstorm 2015 Linux diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp index 1a798aa8..d6ae339e 100644 --- a/src/hacks/Achievement.cpp +++ b/src/hacks/Achievement.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "Achievement.h" -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace achievement { diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp index df08097d..e6fe3869 100644 --- a/src/hacks/Aimbot.cpp +++ b/src/hacks/Aimbot.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace shared { namespace aimbot { diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp index fec3fe61..51687099 100644 --- a/src/hacks/AntiAim.cpp +++ b/src/hacks/AntiAim.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "AntiAim.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace antiaim { diff --git a/src/hacks/AntiBackstab.cpp b/src/hacks/AntiBackstab.cpp index 43257891..03189589 100644 --- a/src/hacks/AntiBackstab.cpp +++ b/src/hacks/AntiBackstab.cpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../hack.h" +#include "common.hpp" +#include "hack.hpp" namespace hacks { namespace tf2 { namespace antibackstab { diff --git a/src/hacks/AntiCheat.cpp b/src/hacks/AntiCheat.cpp index 4fa53787..0a09194c 100644 --- a/src/hacks/AntiCheat.cpp +++ b/src/hacks/AntiCheat.cpp @@ -5,15 +5,8 @@ * Author: nullifiedcat */ -#include "AntiCheat.hpp" -#include "../common.h" - -#include "../hack.h" - -#include "ac/aimbot.hpp" -#include "ac/antiaim.hpp" -#include "ac/removecond.hpp" -#include "ac/bhop.hpp" +#include "common.hpp" +#include "hack.hpp" namespace hacks { namespace shared { namespace anticheat { diff --git a/src/hacks/AntiDisguise.cpp b/src/hacks/AntiDisguise.cpp index 9b5ff8dc..584de75d 100644 --- a/src/hacks/AntiDisguise.cpp +++ b/src/hacks/AntiDisguise.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "AntiDisguise.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace antidisguise { diff --git a/src/hacks/AutoBackstab.cpp b/src/hacks/AutoBackstab.cpp index 893cf41e..1becf6c4 100644 --- a/src/hacks/AutoBackstab.cpp +++ b/src/hacks/AutoBackstab.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../copypasted/CSignature.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace autobackstab { diff --git a/src/hacks/AutoHeal.cpp b/src/hacks/AutoHeal.cpp index 3b6db455..76af2832 100644 --- a/src/hacks/AutoHeal.cpp +++ b/src/hacks/AutoHeal.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "AutoHeal.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autoheal { diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp index 35e5bdf2..8eeb6d58 100644 --- a/src/hacks/AutoJoin.cpp +++ b/src/hacks/AutoJoin.cpp @@ -5,9 +5,8 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../hack.h" -#include "../copypasted/CSignature.h" +#include "common.hpp" +#include "hack.hpp" namespace hacks { namespace shared { namespace autojoin { diff --git a/src/hacks/AutoReflect.cpp b/src/hacks/AutoReflect.cpp index 62c412d6..27dbd173 100644 --- a/src/hacks/AutoReflect.cpp +++ b/src/hacks/AutoReflect.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "AutoReflect.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autoreflect { diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp index e0a66006..76e2fd7f 100644 --- a/src/hacks/AutoSticky.cpp +++ b/src/hacks/AutoSticky.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "AutoSticky.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf { namespace autosticky { diff --git a/src/hacks/AutoTaunt.cpp b/src/hacks/AutoTaunt.cpp index ac0001f3..512eaac5 100644 --- a/src/hacks/AutoTaunt.cpp +++ b/src/hacks/AutoTaunt.cpp @@ -5,9 +5,8 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../init.hpp" -#include "../hack.h" +#include "common.hpp" +#include "hack.hpp" namespace hacks { namespace tf { namespace autotaunt { diff --git a/src/hacks/Bunnyhop.cpp b/src/hacks/Bunnyhop.cpp index 139eb068..f4ddc691 100644 --- a/src/hacks/Bunnyhop.cpp +++ b/src/hacks/Bunnyhop.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "Bunnyhop.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace bunnyhop { diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp index 3054c488..dd33fe89 100644 --- a/src/hacks/ESP.cpp +++ b/src/hacks/ESP.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "ESP.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace esp { @@ -222,7 +219,7 @@ void CreateMove() { // If not using any other special esp, we lower the min to the max clients if (!buildings && !proj_esp && !item_esp) - limit = min(max_clients, HIGHEST_ENTITY); + limit = std::min(max_clients, HIGHEST_ENTITY); { // I still dont understand the purpose of prof_section and surrounding in brackets PROF_SECTION(CM_ESP_EntityLoop); @@ -465,7 +462,7 @@ void _FASTCALL ProcessEntityPT(CachedEntity* ent) { rgba_t hp = colors::Transparent(colors::Health(health, healthmax), fg.a); rgba_t border = ((ent->m_iClassID == RCC_PLAYER) && IsPlayerInvisible(ent)) ? colors::FromRGBA8(160, 160, 160, fg.a * 255.0f) : colors::Transparent(colors::black, fg.a); // Get bar height - int hbh = (max_y - min_y - 2) * min((float)health / (float)healthmax, 1.0f); + int hbh = (max_y - min_y - 2) * std::min((float)health / (float)healthmax, 1.0f); // Draw draw_api::draw_rect_outlined(min_x - 7, min_y, 7, max_y - min_y, border, 0.5f); diff --git a/src/hacks/FollowBot.cpp b/src/hacks/FollowBot.cpp index 88d5d40d..0d90c623 100644 --- a/src/hacks/FollowBot.cpp +++ b/src/hacks/FollowBot.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "FollowBot.h" - -#include "../common.h" +#include "common.hpp" #if ENABLE_IPC == 1 diff --git a/src/hacks/HealArrows.cpp b/src/hacks/HealArrows.cpp index f061cf45..96c16fc3 100644 --- a/src/hacks/HealArrows.cpp +++ b/src/hacks/HealArrows.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "../common.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace healarrow { @@ -41,7 +41,7 @@ public: ReplaceString(msg, "##", std::to_string(health)); ReplaceString(msg, "@@", std::to_string(health + damageamount)); ReplaceString(msg, "%%", pinfo.name); - chat_stack::Say(msg); + chat_stack::Say(msg, false); } } } @@ -80,7 +80,7 @@ void Draw() { #if ENABLE_VISUALS == 1 if (healarrow) { if ((g_GlobalVars->curtime - healarrow_time) < float(healarrow_timeout)) { - AddCenterString(format("Heal arrow charge: ", int(min(100.0f, (g_GlobalVars->curtime - healarrow_time) / float(healarrow_timeout)) * 100.0f), '%'), colors::yellow); + AddCenterString(format("Heal arrow charge: ", int(std::min(100.0f, (g_GlobalVars->curtime - healarrow_time) / float(healarrow_timeout)) * 100.0f), '%'), colors::yellow); // AddCenterString(format("Heal arrow time: ", healarrow_time)); } else { AddCenterString("Heal arrow ready", colors::green); diff --git a/src/hacks/KillSay.cpp b/src/hacks/KillSay.cpp index 8ec75c48..13ff71f4 100644 --- a/src/hacks/KillSay.cpp +++ b/src/hacks/KillSay.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "KillSay.h" -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace killsay { @@ -132,6 +130,6 @@ void KillSayEventListener::FireGameEvent(IGameEvent* event) { if (!hacks::shared::killsay::killsay_mode) return; std::string message = hacks::shared::killsay::ComposeKillSay(event); if (message.size()) { - chat_stack::Say(message); + chat_stack::Say(message, false); } } diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp index 36065d68..84484bdf 100644 --- a/src/hacks/LagExploit.cpp +++ b/src/hacks/LagExploit.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "LagExploit.hpp" +#include "common.hpp" namespace hacks { namespace shared { namespace lagexploit { @@ -34,7 +34,7 @@ CatCommand reset_command_number("debug_reset_cmd_number", "", []() { int exticks = 0; void AddExploitTicks(int ticks) { - exticks = max(ticks, exticks); + exticks = std::max(ticks, exticks); } // Instant re-zoom storage vars diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp index 1df02af1..824f8f4a 100644 --- a/src/hacks/Misc.cpp +++ b/src/hacks/Misc.cpp @@ -5,28 +5,17 @@ * Author: nullifiedcat */ -#include "Misc.h" - #include - #include #include #include #include - -#include "../beforecheaders.h" -#include -#include "../aftercheaders.h" - #include -#include "../sharedobj.h" -#include "../hack.h" -#include "../common.h" -#include "../sdk.h" -#include "../hooks/hookedmethods.h" -#include "../netmessage.h" -#include "../copypasted/CSignature.h" +#include "sharedobj.hpp" + +#include "hack.hpp" +#include "common.hpp" namespace hacks { namespace shared { namespace misc { diff --git a/src/hacks/Noisemaker.cpp b/src/hacks/Noisemaker.cpp index 974ac477..64d96f8c 100644 --- a/src/hacks/Noisemaker.cpp +++ b/src/hacks/Noisemaker.cpp @@ -5,11 +5,7 @@ * Author: nullifiedcat */ -#include "Noisemaker.h" - -#include "../copypasted/CSignature.h" -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf2 { namespace noisemaker { diff --git a/src/hacks/Radar.cpp b/src/hacks/Radar.cpp index fa2ef0e6..71ed30b4 100644 --- a/src/hacks/Radar.cpp +++ b/src/hacks/Radar.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "Radar.hpp" -#include "../common.h" +#include "common.hpp" #ifndef FEATURE_RADAR_DISABLED diff --git a/src/hacks/SkinChanger.cpp b/src/hacks/SkinChanger.cpp index 6d01ab8a..c6a5e5d7 100644 --- a/src/hacks/SkinChanger.cpp +++ b/src/hacks/SkinChanger.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "SkinChanger.hpp" -#include "../copypasted/CSignature.h" +#include "common.hpp" #include #include diff --git a/src/hacks/Spam.cpp b/src/hacks/Spam.cpp index d059047a..3ff9474f 100644 --- a/src/hacks/Spam.cpp +++ b/src/hacks/Spam.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "Spam.h" -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace spam { static CatEnum spam_enum({"DISABLED", "CUSTOM", "DEFAULT", "LENNYFACES", "BLANKS", "NULLCORE", "LMAOBOX", "LITHIUM"}); @@ -262,7 +260,7 @@ void CreateMove() { if (random_order) current_index = rand() % source->size(); std::string spamString = source->at(current_index); if (FormatSpamMessage(spamString)) - chat_stack::Say(spamString); + chat_stack::Say(spamString, false); current_index++; } last_spam_point = std::chrono::system_clock::now(); diff --git a/src/hacks/SpyAlert.cpp b/src/hacks/SpyAlert.cpp index 86b1a7c1..30e1590c 100644 --- a/src/hacks/SpyAlert.cpp +++ b/src/hacks/SpyAlert.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "SpyAlert.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace tf { namespace spyalert { diff --git a/src/hacks/Trigger.cpp b/src/hacks/Trigger.cpp index 18b5795a..20945c2b 100644 --- a/src/hacks/Trigger.cpp +++ b/src/hacks/Trigger.cpp @@ -6,14 +6,7 @@ * Author: nullifiedcat */ -#include "../beforecheaders.h" -#include // std::unique_ptr -#include "../aftercheaders.h" - -#include "Trigger.h" - -#include "../common.h" -#include "../sdk.h" +#include "common.hpp" namespace hacks { namespace shared { namespace triggerbot { @@ -211,8 +204,8 @@ bool IsTargetStateGood(CachedEntity* entity) { if (hb) { // Get the min and max for the hitbox - Vector minz(min(hb->min.x, hb->max.x), min(hb->min.y, hb->max.y), min(hb->min.z, hb->max.z)); - Vector maxz(max(hb->min.x, hb->max.x), max(hb->min.y, hb->max.y), max(hb->min.z, hb->max.z)); + Vector minz(std::min(hb->min.x, hb->max.x), std::min(hb->min.y, hb->max.y), std::min(hb->min.z, hb->max.z)); + Vector maxz(std::max(hb->min.x, hb->max.x), std::max(hb->min.y, hb->max.y), std::max(hb->min.z, hb->max.z)); // Shrink the hitbox here Vector size = maxz - minz; diff --git a/src/hacks/UberSpam.cpp b/src/hacks/UberSpam.cpp index 009c6a4e..59a6d749 100644 --- a/src/hacks/UberSpam.cpp +++ b/src/hacks/UberSpam.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "UberSpam.hpp" +#include "common.hpp" namespace hacks { namespace tf { namespace uberspam { diff --git a/src/hacks/Walkbot.cpp b/src/hacks/Walkbot.cpp index 7e288d1a..b32ba468 100644 --- a/src/hacks/Walkbot.cpp +++ b/src/hacks/Walkbot.cpp @@ -5,8 +5,8 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../hack.h" +#include "common.hpp" +#include "hack.hpp" #include #include diff --git a/src/hacks/ac/aimbot.cpp b/src/hacks/ac/aimbot.cpp index a001901f..27ad59d2 100644 --- a/src/hacks/ac/aimbot.cpp +++ b/src/hacks/ac/aimbot.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "aimbot.hpp" -#include "../../common.h" +#include "common.hpp" namespace ac { namespace aimbot { diff --git a/src/hacks/ac/antiaim.cpp b/src/hacks/ac/antiaim.cpp index e3556047..581ba502 100644 --- a/src/hacks/ac/antiaim.cpp +++ b/src/hacks/ac/antiaim.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "antiaim.hpp" -#include "../../common.h" +#include "common.hpp" namespace ac { namespace antiaim { diff --git a/src/hacks/ac/bhop.cpp b/src/hacks/ac/bhop.cpp index 7bcadcde..99177999 100644 --- a/src/hacks/ac/bhop.cpp +++ b/src/hacks/ac/bhop.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "bhop.hpp" -#include "../../common.h" +#include "common.hpp" namespace ac { namespace bhop { diff --git a/src/hacks/ac/removecond.cpp b/src/hacks/ac/removecond.cpp index 297aeb04..e343b346 100644 --- a/src/hacks/ac/removecond.cpp +++ b/src/hacks/ac/removecond.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "removecond.hpp" -#include "../../common.h" +#include "common.hpp" namespace ac { namespace removecond { diff --git a/src/hacks/hacklist.h b/src/hacks/hacklist.h deleted file mode 100644 index ce620fc5..00000000 --- a/src/hacks/hacklist.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * hacklist.h - * - * Created on: Dec 18, 2016 - * Author: nullifiedcat - */ - -#ifndef HACKS_HACKLIST_H_ -#define HACKS_HACKLIST_H_ - -#if ENABLE_VISUALS == 1 - -#include "ESP.h" -#include "SkinChanger.hpp" -#include "Radar.hpp" -#include "SpyAlert.h" - -#endif - -#include "Aimbot.h" -#include "AntiAim.h" -#include "AntiDisguise.h" -#include "AutoHeal.h" -#include "AutoReflect.h" -#include "AutoSticky.h" -#include "AntiCheat.hpp" -#include "Bunnyhop.h" -#include "LagExploit.hpp" -#include "Walkbot.hpp" -#include "AutoJoin.hpp" -#include "AntiBackstab.hpp" -#include "AutoBackstab.hpp" -#include "FollowBot.h" -#include "HealArrows.hpp" -#include "Misc.h" -#include "Trigger.h" -#include "KillSay.h" -#include "UberSpam.hpp" -#include "Achievement.h" -#include "Spam.h" -#include "Noisemaker.h" -#include "FollowBot.h" - -#endif /* HACKS_HACKLIST_H_ */ diff --git a/src/helpers.cpp b/src/helpers.cpp index 581872cf..4291ca96 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" -#include "hooks.h" -#include "sdk.h" -#include "profiler.h" +#include "common.hpp" #include diff --git a/src/hitrate.cpp b/src/hitrate.cpp index a3d2db39..6a74b646 100644 --- a/src/hitrate.cpp +++ b/src/hitrate.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" #include "init.hpp" namespace hitrate { diff --git a/src/hooks.cpp b/src/hooks.cpp index 3e86ca27..b5c1a4d4 100644 --- a/src/hooks.cpp +++ b/src/hooks.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "hooks.h" - -#include "logging.h" +#include "common.hpp" #include #include diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp index 14f1655d..9b22a782 100644 --- a/src/hooks/CreateMove.cpp +++ b/src/hooks/CreateMove.cpp @@ -5,16 +5,11 @@ * Author: nullifiedcat */ -#include "CreateMove.h" +#include "common.hpp" +#include "hack.hpp" -#include "../hooks.h" -#include "../hack.h" -#include "../common.h" -#include "hookedmethods.h" #include -#include "../profiler.h" - static CatVar minigun_jump(CV_SWITCH, "minigun_jump", "0", "TF2C minigun jump", "Allows jumping while shooting with minigun"); CatVar jointeam(CV_SWITCH, "fb_autoteam", "1", "Joins player team automatically (NYI)"); diff --git a/src/hooks/PaintTraverse.cpp b/src/hooks/PaintTraverse.cpp index 94e595ec..bec2d8be 100644 --- a/src/hooks/PaintTraverse.cpp +++ b/src/hooks/PaintTraverse.cpp @@ -5,14 +5,8 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "PaintTraverse.h" -#include "../hack.h" -#include "hookedmethods.h" -#include "../segvcatch/segvcatch.h" -#include "../copypasted/CSignature.h" -#include "../profiler.h" -#include "../netmessage.h" +#include "common.hpp" +#include "hack.hpp" CatVar clean_screenshots(CV_SWITCH, "clean_screenshots", "1", "Clean screenshots", "Don't draw visuals while taking a screenshot"); CatVar disable_visuals(CV_SWITCH, "no_visuals", "0", "Disable ALL drawing", "Completely hides cathook"); diff --git a/src/hooks/nographics.cpp b/src/hooks/nographics.cpp index 8f047361..62116b39 100644 --- a/src/hooks/nographics.cpp +++ b/src/hooks/nographics.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "../common.h" +#include "common.hpp" /*// 81 ITexture *FindTexture_null_hook(void* this_, char const* pTextureName, const char *pTextureGroupName, bool complain, int nAdditionalCreationFlags) { diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp index 3c2e6e2c..4a5d575d 100644 --- a/src/hooks/others.cpp +++ b/src/hooks/others.cpp @@ -5,13 +5,12 @@ * Author: nullifiedcat */ -#include "../common.h" -#include "../netmessage.h" -#include "../chatlog.hpp" -#include "../hack.h" -#include "ucccccp.hpp" -#include "../hitrate.hpp" -#include "hookedmethods.h" +#include "common.hpp" +#include "ucccccp/ucccccp.hpp" +#include "hack.hpp" +#include "hitrate.hpp" +#include "chatlog.hpp" +#include "netmessage.hpp" #if ENABLE_VISUALS == 1 diff --git a/src/hooks/sdl.cpp b/src/hooks/sdl.cpp index 74284f0d..a42fd95d 100644 --- a/src/hooks/sdl.cpp +++ b/src/hooks/sdl.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "../common.h" +#include "common.hpp" #ifdef RENDERING_ENGINE_OPENGL diff --git a/src/hoovy.cpp b/src/hoovy.cpp index a58d6078..a5838688 100644 --- a/src/hoovy.cpp +++ b/src/hoovy.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" static bool hoovy_list[32] = { 0 }; diff --git a/src/https_request.cpp b/src/https_request.cpp index 6b3af389..485aba3b 100644 --- a/src/https_request.cpp +++ b/src/https_request.cpp @@ -5,10 +5,9 @@ * Author: nullifiedcat */ +#include #include "https_request.hpp" -#include "logging.h" - #include #include #include diff --git a/src/interfaces.cpp b/src/interfaces.cpp index 5ebf95e4..cc014b94 100644 --- a/src/interfaces.cpp +++ b/src/interfaces.cpp @@ -5,17 +5,15 @@ * Author: nullifiedcat */ -#include "common.h" -#include "sharedobj.h" -#include "copypasted/CSignature.h" -#include "sdk.h" +#include "common.hpp" +#include "sharedobj.hpp" #include -#include "beforecheaders.h" +#include "beforecheaders.hpp" #include #include -#include "aftercheaders.h" +#include "aftercheaders.hpp" #include diff --git a/src/ipc.cpp b/src/ipc.cpp index 33368586..5acc8968 100644 --- a/src/ipc.cpp +++ b/src/ipc.cpp @@ -6,10 +6,10 @@ */ -#include "ipc.h" +#include "ipc.hpp" -#include "common.h" -#include "hack.h" +#include "common.hpp" +#include "hack.hpp" #include "hitrate.hpp" #if ENABLE_IPC == 1 diff --git a/src/itemtypes.cpp b/src/itemtypes.cpp index f6c7b1e5..e0e75b88 100644 --- a/src/itemtypes.cpp +++ b/src/itemtypes.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "itemtypes.h" - -#include "common.h" -#include "sdk.h" +#include "common.hpp" ItemManager::ItemManager() : mapper() { // == MEDKITS diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 16f16449..9a0b49e2 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -5,8 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" -#include "sdk.h" +#include "common.hpp" void LocalPlayer::Update() { CachedEntity *wep; diff --git a/src/logging.cpp b/src/logging.cpp index 3d23461e..962c7571 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -10,8 +10,7 @@ #include -#include "common.h" -#include "sdk.h" +#include "common.hpp" FILE* logging::handle = 0; diff --git a/src/netmessage.cpp b/src/netmessage.cpp index f1517572..cdd1570c 100644 --- a/src/netmessage.cpp +++ b/src/netmessage.cpp @@ -5,9 +5,9 @@ * Author: nullifiedcat */ -#include "netmessage.h" -#include "logging.h" -#include "common.h" +#include +#include +#include "common.hpp" bf_write::bf_write() { diff --git a/src/netvars.cpp b/src/netvars.cpp index 43b09283..2e6df567 100644 --- a/src/netvars.cpp +++ b/src/netvars.cpp @@ -6,7 +6,7 @@ a * entity.cpp */ #include "copypasted/Netvar.h" -#include "common.h" +#include "common.hpp" NetVars netvar; diff --git a/src/playerlist.cpp b/src/playerlist.cpp index c41dffd4..2cdf2937 100644 --- a/src/playerlist.cpp +++ b/src/playerlist.cpp @@ -6,7 +6,7 @@ */ #include "playerlist.hpp" -#include "common.h" +#include "common.hpp" #include #include diff --git a/src/playerresource.cpp b/src/playerresource.cpp index 77430dd5..fa102c1e 100644 --- a/src/playerresource.cpp +++ b/src/playerresource.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" void TFPlayerResource::Update() { IClientEntity *ent; diff --git a/src/prediction.cpp b/src/prediction.cpp index f5097357..fe9b1db0 100644 --- a/src/prediction.cpp +++ b/src/prediction.cpp @@ -5,24 +5,7 @@ * Author: nullifiedcat */ -#include "prediction.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "conditions.h" -#include "entitycache.h" -#include "helpers.h" -#include "interfaces.h" -#include "localplayer.h" -#include "netvars.h" -#include "trace.h" +#include "common.hpp" // TODO there is a Vector() object created each call. diff --git a/src/profiler.cpp b/src/profiler.cpp index 95390f26..1944fac2 100644 --- a/src/profiler.cpp +++ b/src/profiler.cpp @@ -5,9 +5,7 @@ * Author: nullifiedcat */ -#include "profiler.h" -#include "cvwrapper.h" -#include "logging.h" +#include "common.hpp" unsigned g_spewcount { 0 }; diff --git a/src/projlogging.cpp b/src/projlogging.cpp index 31d42771..42928d89 100644 --- a/src/projlogging.cpp +++ b/src/projlogging.cpp @@ -6,7 +6,7 @@ */ #include "projlogging.hpp" -#include "common.h" +#include "common.hpp" namespace projectile_logging { diff --git a/src/sdk/HUD.cpp b/src/sdk/HUD.cpp index 93032b33..84de641e 100644 --- a/src/sdk/HUD.cpp +++ b/src/sdk/HUD.cpp @@ -5,9 +5,10 @@ * Author: nullifiedcat */ -#include "HUD.h" -#include "../logging.h" -#include "../copypasted/CSignature.h" +#include +#include "sdk/HUD.h" + +#include "copypasted/CSignature.h" #include diff --git a/src/sdk/MaterialSystemUtil.cpp b/src/sdk/MaterialSystemUtil.cpp index 7a8b5d41..52e14019 100644 --- a/src/sdk/MaterialSystemUtil.cpp +++ b/src/sdk/MaterialSystemUtil.cpp @@ -12,7 +12,7 @@ #include "materialsystem/imaterialsystem.h" #include "tier1/KeyValues.h" -#include "../common.h" +#include "common.hpp" // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" diff --git a/src/sdk/TFGCClientSystem.cpp b/src/sdk/TFGCClientSystem.cpp index c28221bf..1d4f58b5 100644 --- a/src/sdk/TFGCClientSystem.cpp +++ b/src/sdk/TFGCClientSystem.cpp @@ -5,9 +5,10 @@ * Author: nullifiedcat */ -#include "../copypasted/CSignature.h" -#include "TFGCClientSystem.hpp" -#include "../logging.h" +#include "copypasted/CSignature.h" +#include "sdk/TFGCClientSystem.hpp" + +#include int TFGCClientSystem::RequestSelectWizardStep(int type) { diff --git a/src/sdk/convar.cpp b/src/sdk/convar.cpp index fb653692..e68b9cd9 100644 --- a/src/sdk/convar.cpp +++ b/src/sdk/convar.cpp @@ -6,7 +6,8 @@ // //===========================================================================// -#include "../fixsdk.h" +#include "fixsdk.hpp" + #include #include #include @@ -30,10 +31,9 @@ #define ALLOW_DEVELOPMENT_CVARS #endif -/* URAN */ #define Q_snprintf snprintf -#include "../logging.h" -#include "../interfaces.h" +#include +#include //----------------------------------------------------------------------------- diff --git a/src/sharedobj.cpp b/src/sharedobj.cpp index 826fca32..c7febd89 100644 --- a/src/sharedobj.cpp +++ b/src/sharedobj.cpp @@ -5,14 +5,7 @@ * Author: nullifiedcat */ -#include "sharedobj.h" -#include "logging.h" -#include "helpers.h" -#include "copypasted/CSignature.h" - -#include -#include -#include +#include "common.hpp" namespace sharedobj { diff --git a/src/targethelper.cpp b/src/targethelper.cpp index a551c1ab..a2b916ba 100644 --- a/src/targethelper.cpp +++ b/src/targethelper.cpp @@ -5,7 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" +#include "common.hpp" /* * Targeting priorities: diff --git a/src/textfile.cpp b/src/textfile.cpp index a30ad0b4..69635978 100644 --- a/src/textfile.cpp +++ b/src/textfile.cpp @@ -5,13 +5,7 @@ * Author: nullifiedcat */ -#include "textfile.h" - -#include "common.h" - -#include "beforecheaders.h" -#include -#include "aftercheaders.h" +#include "common.hpp" #include diff --git a/src/textmode.cpp b/src/textmode.cpp index f085d600..19cff932 100644 --- a/src/textmode.cpp +++ b/src/textmode.cpp @@ -5,10 +5,7 @@ * Author: nullifiedcat */ -#include "common.h" -#include "init.hpp" -#include "copypasted/CSignature.h" -#include "cvwrapper.h" +#include "common.hpp" #include #include diff --git a/src/trace.cpp b/src/trace.cpp index de2b287f..0fd52caa 100644 --- a/src/trace.cpp +++ b/src/trace.cpp @@ -5,12 +5,7 @@ * Author: nullifiedcat */ -#include "trace.h" -#include "logging.h" - -#include - -#include "sdk.h" +#include "common.hpp" // This file is a mess. I need to fix it. TODO diff --git a/src/ucccccp_cmds.cpp b/src/ucccccp_cmds.cpp index b791fbbe..8eaf847a 100644 --- a/src/ucccccp_cmds.cpp +++ b/src/ucccccp_cmds.cpp @@ -6,7 +6,7 @@ */ #include "ucccccp.hpp" -#include "common.h" +#include "common.hpp" #include "ucccccp_cmds.hpp" CatCommand utfccp_encrypt("ucccccp_encrypt", "Encrypt a message", [](const CCommand& args) { diff --git a/src/velocity.cpp b/src/velocity.cpp index 3ecb8c9a..5d3400a0 100644 --- a/src/velocity.cpp +++ b/src/velocity.cpp @@ -6,7 +6,7 @@ */ #include "velocity.hpp" -#include "common.h" +#include "common.hpp" #include "copypasted/CSignature.h" namespace velocity {