C++ headers fix

cathook/.cproject

@@ -50,10 +50,17 @@
 								<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">
 									<listOptionValue builtIn="false" value="TF2"/>
-									<listOptionValue builtIn="false" value="__DRM_ENABLED=false"/>
+									<listOptionValue builtIn="false" value="_POSIX=1"/>
+									<listOptionValue builtIn="false" value="RAD_TELEMETRY_DISABLED"/>
+									<listOptionValue builtIn="false" value="LINUX=1"/>
+									<listOptionValue builtIn="false" value="_LINUX=1"/>
+									<listOptionValue builtIn="false" value="POSIX=1"/>
+									<listOptionValue builtIn="false" value="GNUC=1"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.debugging.other.1695695237" name="Other debugging flags" superClass="gnu.cpp.compiler.option.debugging.other" useByScannerDiscovery="false" value="-ggdb" valueType="string"/>
-								<option id="gnu.cpp.compiler.option.dialect.flags.1534861554" superClass="gnu.cpp.compiler.option.dialect.flags" useByScannerDiscovery="true" value="-std=gnu++11" valueType="string"/>
+								<option id="gnu.cpp.compiler.option.dialect.flags.1534861554" name="Other dialect flags" superClass="gnu.cpp.compiler.option.dialect.flags" useByScannerDiscovery="true" value="-std=gnu++11" valueType="string"/>
+								<option id="gnu.cpp.compiler.option.warnings.allwarn.1479643223" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.compiler.option.warnings.nowarn.1243202916" name="Inhibit all warnings (-w)" superClass="gnu.cpp.compiler.option.warnings.nowarn" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.236333340" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1506529605" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">

cathook/.gitignore

@@ -11,3 +11,4 @@
 /Lilac/
 /obj/*
 /bin/*
+/ssdk/*

cathook/src/aftercheaders.h

@@ -0,0 +1,6 @@
+#ifndef min
+#define min(a,b)  (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)  (((a) > (b)) ? (a) : (b))
+#endif

cathook/src/beforecheaders.h

@@ -0,0 +1,2 @@
+#undef min
+#undef max

cathook/src/common.h

@@ -8,6 +8,10 @@
 #ifndef COMMON_H_
 #define COMMON_H_
 
+#include "beforecheaders.h"
+#include <vector>
+
+#include "aftercheaders.h"
 #include "drawing.h"
 #include "entitycache.h"
 #include "enums.h"

cathook/src/fixsdk.h

@@ -8,11 +8,11 @@
 #ifndef FIXSDK_H_
 #define FIXSDK_H_
 
-#define  LINUX 1
+/*#define  LINUX 1
 #define _LINUX 1
 #define  POSIX 1
 #define   GNUC 1
 #define NO_MALLOC_OVERRIDE 1
-#undef min
+#undef min*/
 
 #endif /* FIXSDK_H_ */

cathook/src/gui/MenuWindow.cpp

@@ -10,3 +10,5 @@
 MenuWindow::MenuWindow(IWidget* parent, const char* name) : CBaseWindow(parent, name) {
 
 }
+
+MenuWindow::~MenuWindow() {}

cathook/src/hack.cpp

@@ -7,6 +7,10 @@
 
 #include "hack.h"
 
+#include "beforecheaders.h"
+#include <vector>
+#include <map>
+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <sys/prctl.h>
@@ -19,6 +23,7 @@
 #include "segvcatch/segvcatch.h"
 #include <csignal>
 #include <sys/sysinfo.h>
+#include "aftercheaders.h"
 
 #include <steam/isteamuser.h>
 // All Hacks
@@ -51,6 +56,7 @@
 bool hack::shutdown = false;
 
 ICvar* g_pCVar = 0;
+std::string ggggppppvvvv;
 
 void hack::InitHacks() {
 	ADD_HACK(AutoStrafe);
@@ -182,11 +188,6 @@ void hack::Initialize() {
 	g_GlowObjectManager = *reinterpret_cast<CGlowObjectManager**>(gSignatures.GetClientSignature("C1 E0 05 03 05") + 5);
 	logging::Info("GlowObjectManager: 0x%08x", g_GlowObjectManager);
 	InitStrings();
-
-	KeyValues::AutoDelete kv("TestKeyValues");
-	kv->SetBool("rekt", true);
-	logging::Info("%i", kv->GetBool("rekt"));
-
 	g_pChatStack = new ChatStack();
 	logging::Info("Init done!");
 }

cathook/src/hack.h

@@ -26,6 +26,11 @@
 #define DELETE_HACK(x) \
 	delete g_ph##x
 
+#include "beforecheaders.h"
+#include <string>
+#include "aftercheaders.h"
+extern std::string ggggppppvvvv;
+
 class IHack;
 class CUserCmd;
 class CViewSetup;

cathook/src/sdk.h

@@ -45,7 +45,6 @@
 #include <steam/isteamuser.h>
 #include <steam/steam_api.h>
 #include <vgui/Cursor.h>
-#include <KeyValues.h>
 
 #include "sdk/in_buttons.h"
 #include "sdk/iinput.h"