Merge branch 'mr-144'

tweak(gta-net-five): fix GTA_FIVE ifdef's (mr-144): - d03d2be tweak(gta-net-five): fix GTA_FIVE ifdef's
citizenfx · Nov 6, 2023 · 7b59ac0 · 7b59ac0
2 parents 47f8999 + d03d2be
commit 7b59ac0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/code/components/gta-net-five/src/CloneExperiments.cpp b/code/components/gta-net-five/src/CloneExperiments.cpp
@@ -782,7 +782,8 @@ static CNetGamePlayer* AllocateNetPlayer(void* mgr)
 
 // fix: some Events expect the CPlayerInfo to be non-null in the CNetGamePlayer (It is not set in the constructor)
 static void Player31_ApplyPlayerInfo(CNetGamePlayer* player)
-{
+{
+#ifdef GTA_FIVE
 	static void* infoMem = nullptr;
 	if (!infoMem)
 	{
@@ -794,11 +795,14 @@ static void Player31_ApplyPlayerInfo(CNetGamePlayer* player)
 	{
 		*(CPlayerInfo_Five**)((uint64_t)player + g_CNetPlayerOffset_PlayerInfo) = (CPlayerInfo_Five*)infoMem;
 	}
+#endif
 }
 // Clear the playerInfo after events
 static void Player31_ClearPlayerInfo(CNetGamePlayer* player)
-{
-	*(CPlayerInfo_Five**)((uint64_t)player + g_CNetPlayerOffset_PlayerInfo) = nullptr;
+{
+#ifdef GTA_FIVE
+	*(CPlayerInfo_Five**)((uint64_t)player + g_CNetPlayerOffset_PlayerInfo) = nullptr;
+#endif
 }
 
 #include <minhook.h>