header sorting

.cproject

@@ -51,9 +51,8 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/source-sdk-2013/mp/src/public/tier0}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/source-sdk-2013/mp/src/public/tier1}&quot;"/>
 									<listOptionValue builtIn="false" value="/usr/include/SDL2"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/kathook/src/imgui}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/kathook/src/freetype-gl}&quot;"/>
 									<listOptionValue builtIn="false" value="/usr/local/include/freetype2"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cathook/include}&quot;"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.other.verbose.1509393088" name="Verbose (-v)" superClass="gnu.cpp.compiler.option.other.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/>
 								<option id="gnu.cpp.compiler.option.preprocessor.def.116822749" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -81,7 +80,9 @@
 								<option id="gnu.c.compiler.option.dialect.std.1436721060" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.misc.other.743672320" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -shared -m32" valueType="string"/>
 								<option id="gnu.c.compiler.option.misc.pic.1956969567" name="Position Independent Code (-fPIC)" superClass="gnu.c.compiler.option.misc.pic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option id="gnu.c.compiler.option.include.paths.634898295" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false"/>
+								<option id="gnu.c.compiler.option.include.paths.634898295" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cathook/include}&quot;"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.720576197" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.622955675" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">
@@ -107,21 +108,34 @@
 								</inputType>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1494960833" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-								<option id="gnu.both.asm.option.include.paths.536294380" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
+								<option id="gnu.both.asm.option.include.paths.536294380" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cathook/include}&quot;"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.517639342" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="memory|classinfo|ncc|source-sdk-2013|autogen|vtables|segvcatch|gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="freetype-gl|imgui|include|memory|classinfo|ncc|source-sdk-2013|autogen|vtables|segvcatch|gui|copypasted|targeting|ipc|mem|hooks|sdk|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="freetype-gl"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="imgui"/>
+						<entry excluding="copypasted|gui|classinfo|hooks|hacks|sdk" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/classinfo"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/copypasted"/>
+						<entry excluding="ncc|im" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui/im"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/gui/ncc"/>
+						<entry excluding="ac" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hacks"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hacks/ac"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/hooks"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include/sdk"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="segvcatch"/>
 						<entry excluding="hacks/ac|memory|imgui|classinfo|autogen|vtables|segvcatch|gui|targeting|ipc|mem" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/classinfo"/>
 						<entry excluding="im|ncc|depr" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui/im"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/gui/ncc"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/hacks/ac"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/imgui"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/segvcatch"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

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 {
 	

include/CDumper.hpp

@@ -5,18 +5,17 @@
  *      Author: nullifiedcat
  */
 
-#ifndef CDUMPER_H_
+#ifndef CDUMPER_HPP_
-#define CDUMPER_H_
+#define CDUMPER_HPP_
 
-#include "beforecheaders.h"
+#include <aftercheaders.hpp>
+#include <beforecheaders.hpp>
 #include <fstream>
 #include <string>
-#include "aftercheaders.h"
-
-#include "logging.h"
-#include "fixsdk.h"
 #include <dt_common.h>
 #include <client_class.h>
+#include <fixsdk.hpp>
+#include <logging.hpp>
 
 class CDumper {
 public:
@@ -102,4 +101,4 @@ private:
 };
 
 
-#endif /* CDUMPER_H_ */
+#endif /* CDUMPER_HPP_ */

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 {
 

include/EffectGlow.hpp

@@ -8,9 +8,8 @@
 #ifndef EFFECTGLOW_HPP_
 #define EFFECTGLOW_HPP_
 
-#include "common.h"
+#include "common.hpp"
-#include "sdk/ScreenSpaceEffects.h"
+#include "sdk.hpp"
-#include "sdk.h"
 
 namespace effect_glow {
 

include/angles.hpp

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "common.h"
+#include <logging.hpp>
-#include "logging.h"
+#include "common.hpp"
 
 namespace angles {
 

include/chatstack.hpp

@@ -5,16 +5,16 @@
  *      Author: nullifiedcat
  */
 
-#ifndef CHATSTACK_H_
+#ifndef CHATSTACK_HPP_
-#define CHATSTACK_H_
+#define CHATSTACK_HPP_
 
 #define CHATSTACK_INTERVAL 0.8f
 
-#include "beforecheaders.h"
+#include <beforecheaders.hpp>
 #include <string>
 #include <stack>
 #include <functional>
-#include "aftercheaders.h"
+#include <aftercheaders.hpp>
 
 namespace chat_stack {
 
@@ -32,4 +32,4 @@ extern float last_say;
 
 }
 
-#endif /* CHATSTACK_H_ */
+#endif /* CHATSTACK_HPP_ */

include/classinfo/classinfo.hpp

@@ -8,7 +8,7 @@
 #ifndef CLASSINFO_HPP_
 #define CLASSINFO_HPP_
 
-#include "../common.h"
+#include "common.hpp"
 
 #include "dummy.gen.hpp"
 

include/common.hpp

@@ -15,7 +15,7 @@
 #endif
 
 
-#include "beforecheaders.h"
+#include <beforecheaders.hpp>
 #include <emmintrin.h>
 #include <vector>
 #include <bitset>
@@ -33,11 +33,22 @@
 #include <set>
 #include <unordered_map>
 #include <algorithm>
+#include <csignal>
+
+#include <sys/prctl.h>
+#include <unistd.h>
+#include <link.h>
+#include <sys/sysinfo.h>
+#include <dlfcn.h>
+#include <elf.h>
+#include <sys/mman.h>
+#include <fcntl.h>
 
 #include "timer.hpp"
 #include "averager.hpp"
+#include "segvcatch/segvcatch.h"
 
-#include "aftercheaders.h"
+#include <aftercheaders.hpp>
 
 #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 <entitycache.hpp>
 #include "hoovy.hpp"
-#include "enums.h"
+#include <enums.hpp>
 #include "projlogging.hpp"
 #include "ucccccp_cmds.hpp"
 #include "velocity.hpp"
 #include "angles.hpp"
 #include "entityhitboxcache.hpp"
 #include "globals.h"
-#include "helpers.h"
+#include <helpers.hpp>
 #include "playerlist.hpp"
-#include "interfaces.h"
+#include <interfaces.hpp>
-#include "localplayer.h"
+#include <localplayer.hpp>
-#include "conditions.h"
+#include <conditions.hpp>
-#include "logging.h"
+#include <logging.hpp>
-#include "targethelper.h"
+#include <targethelper.hpp>
 #include "playerresource.h"
-#include "usercmd.h"
+#include "usercmd.hpp"
-#include "trace.h"
+#include "trace.hpp"
-#include "cvwrapper.h"
+#include <cvwrapper.hpp>
-#include "netvars.h"
+#include "netvars.hpp"
-#include "vfunc.h"
+#include "vfunc.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
-#include "prediction.h"
+#include <prediction.hpp>
-#include "conditions.h"
+#include <conditions.hpp>
-#include "itemtypes.h"
+#include <itemtypes.hpp>
-#include "chatstack.h"
+#include <chatstack.hpp>
-#include "textfile.h"
+#include "textfile.hpp"
-#include "ipc.h"
+#include "ipc.hpp"
-#include "hooks/hookedmethods.h"
+#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 <hacks/hacklist.hpp>
 
-#include "sdk.h"
+#include <sdk.hpp>
 
 template<typename T>
 constexpr T _clamp(T _min, T _max, T _val) {

include/conditions.hpp

@@ -5,11 +5,11 @@
  *      Author: nullifiedcat
  */
 
-#ifndef CONDITIONS_H_
+#ifndef CONDITIONS_HPP_
-#define CONDITIONS_H_
+#define CONDITIONS_HPP_
 
-#include "netvars.h"
+#include <entitycache.hpp>
-#include "entitycache.h"
+#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<cond, false>(CE_VAR(ent, netvar.iCond, condition_data_s));
 }
 
-#endif /* CONDITIONS_H_ */
+#endif /* CONDITIONS_HPP_ */

include/copypasted/Netvar.h

@@ -4,7 +4,7 @@
 //#include <cstring>
 #include <string.h>
 #include <memory>
-#include "../logging.h"
+#include "logging.hpp"
 
 // this and the cpp are creds to "Altimor"
 

include/crits.hpp

@@ -5,8 +5,8 @@
  *      Author: nullifiedcat
  */
 
-#ifndef CRITS_H_
+#ifndef CRITS_HPP_
-#define CRITS_H_
+#define CRITS_HPP_
 
 class CUserCmd;
 class IClientEntity;
@@ -35,9 +35,9 @@ void ResetCritHack();
 void LoadSavedState();
 void ModifyCommandNumber();
 
-#include "beforecheaders.h"
+#include <beforecheaders.hpp>
 #include <unordered_map>
-#include "aftercheaders.h"
+#include <aftercheaders.hpp>
 class CatVar;
 extern CatVar experimental_crit_hack;
 
@@ -47,4 +47,4 @@ extern std::unordered_map<int, int> command_number_mod;
 //bool CalcIsAttackCritical(IClientEntity* weapon);
 
 
-#endif /* CRITS_H_ */
+#endif /* CRITS_HPP_ */

include/cvwrapper.hpp

@@ -5,19 +5,19 @@
  *      Author: nullifiedcat
  */
 
-#ifndef CVWRAPPER_H_
+#ifndef CVWRAPPER_HPP_
-#define CVWRAPPER_H_
+#define CVWRAPPER_HPP_
 
 class ConVar;
 
-#include "sdk.h"
+#include <sdk.hpp>
-#include "interfaces.h"
+#include <interfaces.hpp>
 
-#include "beforecheaders.h"
+#include <beforecheaders.hpp>
 #include <string>
 #include <vector>
 #include <functional>
-#include "aftercheaders.h"
+#include <aftercheaders.hpp>
 
 // Catvar types
 enum CatVar_t {
@@ -140,4 +140,4 @@ void RegisterCatCommands();
 void RegisterCatVars();
 int GetRebasedCatVarCount();
 
-#endif /* CVWRAPPER_H_ */
+#endif /* CVWRAPPER_HPP_ */

include/drawgl.hpp

@@ -8,7 +8,7 @@
 #ifndef DRAWGL_HPP_
 #define DRAWGL_HPP_
 
-#include "drawing.h"
+#include <drawing.hpp>
 
 #define draw_api drawgl
 

include/drawing.hpp

@@ -5,8 +5,8 @@
  *      Author: nullifiedcat
  */
 
-#ifndef DRAWING_H_
+#ifndef DRAWING_HPP_
-#define DRAWING_H_
+#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 <texture-font.h>
@@ -62,4 +62,4 @@ constexpr rgba_t GUIColor() {
 }
 #endif
 
-#endif /* DRAWING_H_ */
+#endif /* DRAWING_HPP_ */

include/drawmgr.hpp

@@ -8,9 +8,9 @@
 #ifndef DRAWMGR_HPP_
 #define DRAWMGR_HPP_
 
-#include "beforecheaders.h"
+#include "beforecheaders.hpp"
 #include <mutex>
-#include "aftercheaders.h"
+#include "aftercheaders.hpp"
 
 extern std::mutex drawing_mutex;
 

include/entitycache.hpp

@@ -5,24 +5,22 @@
  *      Author: nullifiedcat
  */
 
-#ifndef ENTITYCACHE_H_
+#ifndef ENTITYCACHE_HPP_
-#define ENTITYCACHE_H_
+#define ENTITYCACHE_HPP_
 
-#include "enums.h"
+#include <aftercheaders.hpp>
-#include "itemtypes.h"
+#include <beforecheaders.hpp>
-#include "interfaces.h"
 #include "entityhitboxcache.hpp"
-#include "fixsdk.h"
-
-#include "beforecheaders.h"
 #include "averager.hpp"
-#include "aftercheaders.h"
-
 #include <mathlib/vector.h>
 #include <mathlib/mathlib.h>
 #include <icliententity.h>
 #include <icliententitylist.h>
 #include <cdll_int.h>
+#include <enums.hpp>
+#include <fixsdk.hpp>
+#include <interfaces.hpp>
+#include <itemtypes.hpp>
 
 struct matrix3x4_t;
 
@@ -134,4 +132,4 @@ extern int max;
 
 }
 
-#endif /* ENTITYCACHE_H_ */
+#endif /* ENTITYCACHE_HPP_ */

include/entityhitboxcache.hpp

@@ -8,11 +8,10 @@
 #ifndef ENTITYHITBOXCACHE_HPP_
 #define ENTITYHITBOXCACHE_HPP_
 
-#include "entitycache.h"
-
 #include <mathlib/vector.h>
 #include <mathlib/mathlib.h>
 #include <cdll_int.h>
+#include <entitycache.hpp>
 #include <studio.h>
 
 #define CACHE_MAX_HITBOXES 64

include/enums.hpp

@@ -5,8 +5,8 @@
  *      Author: nullifiedcat
  */
 
-#ifndef ENUMS_H_
+#ifndef ENUMS_HPP_
-#define ENUMS_H_
+#define ENUMS_HPP_
 
 enum EntityType {
 	ENTITY_GENERIC,
@@ -97,4 +97,4 @@ enum hitbox_t {
 	foot_R = 17
 };
 
-#endif /* ENUMS_H_ */
+#endif /* ENUMS_HPP_ */

include/fidgetspinner.hpp

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "common.hpp"
 #include "atlas.hpp"
 
 class CatVar;

include/fixsdk.hpp

@@ -5,8 +5,8 @@
  *      Author: nullifiedcat
  */
 
-#ifndef FIXSDK_H_
+#ifndef FIXSDK_HPP_
-#define FIXSDK_H_
+#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_ */

include/ftrender.hpp

@@ -8,7 +8,7 @@
 #ifndef FTRENDER_HPP_
 #define FTRENDER_HPP_
 
-#include "common.h"
+#include "common.hpp"
 
 extern "C" {
 #include <texture-font.h>

include/gameinfo.hpp

@@ -8,7 +8,7 @@
 #ifndef GAMEINFO_HPP_
 #define GAMEINFO_HPP_
 
-#include "common.h"
+#include "common.hpp"
 
 #ifdef BUILD_GAME
 

include/gui/GUI.hpp

@@ -5,13 +5,13 @@
  *      Author: nullifiedcat
  */
 
-#ifndef GUI_H_
+#ifndef GUI_HPP_
-#define GUI_H_
+#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_ */

include/hack.hpp

@@ -15,11 +15,11 @@ class bf_read;
 class ConCommand;
 class CCommand;
 
-#include "beforecheaders.h"
+#include <beforecheaders.hpp>
 #include <stack>
 #include <string>
 #include <mutex>
-#include "aftercheaders.h"
+#include <aftercheaders.hpp>
 
 namespace hack {