before ItemESP+

cathook/TODO

@@ -1,11 +1,11 @@
-Trace Fraction
-	
 alias clearcond "host_timescale 300;wait 500;host_timescale 1"
 alias clearcond_taunt "taunt;wait 50;host_timescale 300;wait 500;host_timescale 1"
 bind l clearcond_taunt
 
-no fakelag shoot
+TF2C teams
-	
+TF2C merc
+HL2DM teams
+
 fullbright toggle
 Hunter Rifle
 inspect shit
@@ -16,10 +16,9 @@ Auto backstab, noise maker spam, kill say, team name spam (pre round team name s
 
 Player List
 dominatesay assistsay worldsay
-Huntsman Leg
 DS esp slow
-antinewl switch
 menu reorder
+AutoDetonator
 
 MAX -> MIN priority
 Crit Hack
@@ -49,7 +48,6 @@ Engine Prediction
 An option to ignore taunting enemies
 AutoSticky improve
 No AutoShoot when disguised
-Cloaked ESP
 Ambassador bodyshotting
 No Trigger Mediguns
 More projectile weapons aimbot (wrap assassin, wrangler, stickybomb, airstrike)

cathook/src/hacks/Aimbot.cpp

@@ -105,6 +105,8 @@ Aimbot::Aimbot() {
 			"If disabled, FOV restrictions apply to current target position");
 	this->v_bAimAtTeammates = new CatVar(CV_SWITCH, "aimbot_teammates", "0", "Aim at teammates", NULL,
 			"Aim at your own team. Useful for HL2DM");
+	//this->v_bAdvancedSapperAim = new CatVar(CV_SWITCH, "aimbot_sapper", "1", "Advanced Sapper Aim", NULL,
+	//		"Aim at buildings while holding sapper");
 }
 
 bool Aimbot::ShouldAim(CUserCmd* cmd) {

cathook/src/hacks/Aimbot.h

@@ -84,6 +84,7 @@ public:
 	CatVar* v_ePriorityMode;
 	CatVar* v_bProjPredVisibility;
 	CatVar* v_bProjPredFOV;
+	CatVar* v_bAdvancedSapperAim;
 };
 
 DECLARE_HACK_SINGLETON(Aimbot);

cathook/src/hacks/Misc.cpp

@@ -19,6 +19,7 @@
 #include "../common.h"
 #include <checksum_md5.h>
 #include "../sdk.h"
+#include "../hooks/hookedmethods.h"
 #include "../netmessage.h"
 #include "../copypasted/CSignature.h"
 
@@ -304,6 +305,7 @@ Misc::Misc() {
 	v_bCleanChat = new CatVar(CV_SWITCH, "clean_chat", "1", "Remove newlines from messages", NULL, "Removes newlines from messages, at least it should do that. Might be broken.");
 	if (TF2) c_Schema = CreateConCommand(CON_PREFIX "schema", CC_Misc_Schema, "Load item schema");
 	if (TF2) v_bDebugCrits = new CatVar(CV_SWITCH, "debug_crits", "0", "???", NULL, "???");
+	//if (TF2) v_bHookInspect = new CatVar(CV_SWITCH, "hook_inspect", "0", "Hook CanInspect", NULL, "Once enabled, can't be turned off. cathook can't be unloaded after enabling it");
 	//interfaces::eventManager->AddListener(&listener, "player_death", false);
 }
 
@@ -342,6 +344,20 @@ bool canmeleecrit(IClientEntity* weapon) {
 
 void Misc::ProcessUserCmd(CUserCmd* cmd) {
 	static bool flswitch = false;
+
+	/*if (TF2 && v_bHookInspect->GetBool()) {
+		if (CE_GOOD(LOCAL_W)) {
+			//logging::Info("%i", vfunc<bool(*)(IClientEntity*)>(RAW_ENT(LOCAL_W), offCanInspect, 0)(RAW_ENT(LOCAL_W)));
+			uintptr_t* vtable = *(uintptr_t**)(RAW_ENT(LOCAL_W));
+			if (vtable[offCanInspect] != (uintptr_t)CanInspect_hook) {
+				uintptr_t patch = (uintptr_t)CanInspect_hook;
+				Patch((void*)((uintptr_t)vtable + offCanInspect * 4), &patch, 4);
+				//vtable[offCanInspect] = (uintptr_t*)CanInspect_hook;
+			}
+			//logging::Info("%i", vfunc<bool(*)(IClientEntity*)>(RAW_ENT(LOCAL_W), offCanInspect, 0)(RAW_ENT(LOCAL_W)));
+		}
+	}
+*/
 	if (TF2 && v_bDebugCrits->GetBool() && CE_GOOD(LOCAL_W)) {
 		//static uintptr_t helper = gSignatures.GetClientSignature("55 89 E5 81 EC 88 00 00 00 89 5D F4 8B 5D 08 89 75 F8 89 7D FC 31 FF 89 1C 24 E8 ? ? ? ? 85 C0 89 C6 74 0F 8B 00 89 34 24 FF 90 E0 02 00 00 84 C0 75 14 89 F8 8B 5D F4 8B 75 F8 8B 7D FC 89 EC 5D C3");
 		/*if (interfaces::gvars->curtime - lastcheck >= 1.0f) {
@@ -362,7 +378,7 @@ void Misc::ProcessUserCmd(CUserCmd* cmd) {
 				ciac_s = vfunc<bool(*)(IClientEntity*)>(RAW_ENT(LOCAL_W), 1836 / 4, 0)(RAW_ENT(LOCAL_W));
 				lastcheck = interfaces::gvars->curtime;
 				if (ciac_s != 0) {
-					logging::Info("Attack!!!");
+					//logging::Info("Attack!!!");
 					cmd->buttons = cmd->buttons | IN_ATTACK;
 					AddCenterString(colors::red, "Crit!");
 				}

cathook/src/hacks/Misc.h

@@ -29,6 +29,7 @@ public:
 	CatVar* v_bMinigunJump; // TF2C
 	CatVar* v_bDebugCrits; // TF2C
 	CatVar* v_bAntiAFK;
+	CatVar* v_bHookInspect;
 	CatVar* v_iFakeLag;
 	//ConVar* v_bDumpEventInfo;
 	ConCommand* c_DumpItemAttributes;

cathook/src/hooks/BeginFrame.cpp

@@ -11,7 +11,4 @@
 
 void BeginFrame_hook(IStudioRender* _this) {
 	((BeginFrame_t*)hooks::hkStudioRender->GetMethod(hooks::offBeginFrame))(_this);
-	if (!g_Settings.bInvalid)
-		interfaces::debug->AddTextOverlay(LOCAL_E->m_vecOrigin, -1.0f, "AyyLmao");
-
 }

cathook/src/hooks/hookedmethods.h

@@ -13,6 +13,7 @@ class CUserCmd;
 class INetMessage;
 class bf_read;
 class CViewSetup;
+class IClientEntity;
 
 typedef bool(CreateMove_t)(void*, float, CUserCmd*);
 typedef void(PaintTraverse_t)(void*, unsigned int, bool, bool);
@@ -26,6 +27,9 @@ typedef void(FrameStageNotify_t)(void*, int);
 typedef void(LevelInit_t)(void*, const char*);
 typedef void(LevelShutdown_t)(void*);
 typedef void(BeginFrame_t)(IStudioRender*);
+typedef bool(*CanInspect_t)(IClientEntity*);
+bool CanInspect_hook(IClientEntity*);
+const unsigned int offCanInspect = 512;
 void BeginFrame_hook(IStudioRender*);
 
 #include "CreateMove.h"

cathook/src/hooks/others.cpp

@@ -152,6 +152,8 @@ void LevelInit_hook(void* thisptr, const char* newmap) {
 	g_pChatStack->Reset();
 }
 
+bool CanInspect_hook(IClientEntity*) { return true; }
+
 void LevelShutdown_hook(void* thisptr) {
 	((LevelShutdown_t*) hooks::hkClientMode->GetMethod(hooks::offLevelShutdown))(thisptr);
 	g_Settings.bInvalid = true;