Test fix game_sa

Author: G_Moris

Client/game_sa/CFileLoaderSA.cpp

@@ -37,15 +37,15 @@ CEntitySAInterface* CFileLoaderSA::LoadObjectInstance(SFileObjectInstance* obj)
 class CAtomicModelInfo
 {
 public:
-    void CAtomicModelInfo::DeleteRwObject() { ((void(__thiscall*)(CAtomicModelInfo*))(*(void***)this)[8])(this); }
+    void DeleteRwObject() { ((void(__thiscall*)(CAtomicModelInfo*))(*(void***)this)[8])(this); }
 
-    void CAtomicModelInfo::SetAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CAtomicModelInfo*, RpAtomic*))(*(void***)this)[15])(this, atomic); }
+    void SetAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CAtomicModelInfo*, RpAtomic*))(*(void***)this)[15])(this, atomic); }
 };
 
 class CDamagableModelInfo
 {
 public:
-    void CDamagableModelInfo::SetDamagedAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CDamagableModelInfo*, RpAtomic*))0x4C48D0)(this, atomic); }
+    void SetDamagedAtomic(RpAtomic* atomic) { ((void(__thiscall*)(CDamagableModelInfo*, RpAtomic*))0x4C48D0)(this, atomic); }
 };
 
 static char* GetFrameNodeName(RwFrame* frame)

Client/game_sa/CWorldSA.cpp

@@ -89,9 +89,14 @@ void CWorldSA::InstallHooks()
 DWORD CONTINUE_CWorld_FallenPeds = 0x00565CBA;
 DWORD CONTINUE_CWorld_FallenCars = 0x00565E8A;
 
+bool IsUnderWorldWarpEnabled()
+{
+    return pGame && pGame->IsUnderWorldWarpEnabled();
+}
+
 void _declspec(naked) HOOK_FallenPeds()
 {
-    if (pGame && pGame->IsUnderWorldWarpEnabled())
+    if (IsUnderWorldWarpEnabled())
     {
         _asm
         {
@@ -112,7 +117,7 @@ void _declspec(naked) HOOK_FallenPeds()
 
 void _declspec(naked) HOOK_FallenCars()
 {
-    if (pGame && pGame->IsUnderWorldWarpEnabled())
+    if (IsUnderWorldWarpEnabled())
     {
         _asm
         {

Client/game_sa/HookSystem.h

@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include "gamesa_init.h"
+
 #define     MAX_JUMPCODE_SIZE           20
 
 template <typename T>
@@ -24,6 +26,8 @@ void* FunctionPointerToVoidP(T func)
     return c.b;
 }
 
+BYTE* CreateJump(DWORD dwFrom, DWORD dwTo, BYTE* ByteArray);
+
 template <typename T>
 bool HookInstall(DWORD dwInstallAddress, T dwHookHandler, int iJmpCodeSize = 5)
 {
@@ -40,8 +44,6 @@ bool HookInstall(DWORD dwInstallAddress, T dwHookHandler, int iJmpCodeSize = 5)
     }
 }
 
-BYTE* CreateJump(DWORD dwFrom, DWORD dwTo, BYTE* ByteArray);
-
 // Auto detect requirement of US/EU hook installation
 #define EZHookInstall(type) \
     HookInstall(HOOKPOS_##type, (DWORD)HOOK_##type, HOOKSIZE_##type);

Client/game_sa/premake5.lua

@@ -6,7 +6,7 @@ project "Game SA"
 
 	-- HACK(Jusonex): Temp fix for ebp not being set in naked functions
 	-- More information on this in multiplayer_sa's premake5.lua
-	cppdialect "C++14"
+	cppdialect "C++20"
 
 	pchheader "StdInc.h"
 	pchsource "StdInc.cpp"