From 2d7300f5b37ec9ed66117eaf86cf3694c6a42a05 Mon Sep 17 00:00:00 2001
From: IcePixelx <41352111+PixieCore@users.noreply.github.com>
Date: Mon, 19 Jul 2021 13:36:36 +0200
Subject: [PATCH] Renamed hook and memory addresses, FIxed calling original in
 isPersistenceDataAvailable

---
 r5dev/include/patterns.h | 4 ++--
 r5dev/src/hooks.cpp      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/r5dev/include/patterns.h b/r5dev/include/patterns.h
index 5068576a..d33811f9 100644
--- a/r5dev/include/patterns.h
+++ b/r5dev/include/patterns.h
@@ -46,8 +46,8 @@ namespace
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	/* ==== CCLIENT ========================================================================================================================================================= */
-	DWORD64 p_Persistence_IsReady = /*0x140315CF0*/ reinterpret_cast<DWORD64>(PatternScan("r5apex.exe", "3B 15 ?? ?? ?? ?? 7D 33"));
-	bool (*org_Persistence_IsReady)(__int64 entidx, int client) = (bool(*)(__int64, int))p_Persistence_IsReady;
+	DWORD64 p_CVEngineServer_IsPersistenceDataAvailable = /*0x140315CF0*/ reinterpret_cast<DWORD64>(PatternScan("r5apex.exe", "3B 15 ?? ?? ?? ?? 7D 33"));
+	bool (*org_CVEngineServer_IsPersistenceDataAvailable)(__int64 thisptr /*Class thisptr usually CVEngineServer*/, int client) = (bool(*)(__int64, int))p_CVEngineServer_IsPersistenceDataAvailable;
 
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	/* ==== UTILITY ========================================================================================================================================================= */
diff --git a/r5dev/src/hooks.cpp b/r5dev/src/hooks.cpp
index 647e10ad..b261ed82 100644
--- a/r5dev/src/hooks.cpp
+++ b/r5dev/src/hooks.cpp
@@ -160,7 +160,7 @@ int HMSG_EngineError(char* fmt, va_list args)
 }
 
 // TODO: turn this into a playerstruct constructor if it ever becomes necessary
-bool HPersistence_IsReady(__int64 entidx, int client)
+bool HCVEngineClient_IsPersistenceDataAvailable(__int64 thisptr, int client)
 {
 	static bool isPersistenceVarSet[256];
 
@@ -182,7 +182,8 @@ bool HPersistence_IsReady(__int64 entidx, int client)
 		printf("\n");
 		isPersistenceVarSet[client] = true;
 	}
-	return org_Persistence_IsReady;
+
+	return org_CVEngineServer_IsPersistenceDataAvailable(thisptr, client);
 }
 
 //#################################################################################
@@ -209,7 +210,7 @@ void InstallENHooks()
 	///////////////////////////////////////////////////////////////////////////////
 	// Hook Utility functions
 	DetourAttach((LPVOID*)&org_MSG_EngineError, &HMSG_EngineError);
-	DetourAttach((LPVOID*)&org_Persistence_IsReady, &HPersistence_IsReady);
+	DetourAttach((LPVOID*)&org_CVEngineServer_IsPersistenceDataAvailable, &HCVEngineClient_IsPersistenceDataAvailable);
 
 	///////////////////////////////////////////////////////////////////////////////
 	// Commit the transaction
@@ -245,7 +246,7 @@ void RemoveENHooks()
 	///////////////////////////////////////////////////////////////////////////////
 	// Unhook Utility functions
 	DetourDetach((LPVOID*)&org_MSG_EngineError, &HMSG_EngineError);
-	DetourDetach((LPVOID*)&org_Persistence_IsReady, &HPersistence_IsReady);
+	DetourDetach((LPVOID*)&org_CVEngineServer_IsPersistenceDataAvailable, &HCVEngineClient_IsPersistenceDataAvailable);
 
 	///////////////////////////////////////////////////////////////////////////////
 	// Commit the transaction