RwGlobals and RwDevice stup in Renderware.h

multitheftauto · Nov 10, 2024 · 83b210d · 83b210d
1 parent ca847bb
commit 83b210d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 6 deletions.
diff --git a/Client/multiplayer_sa/CMultiplayerSA_DeviceSelection.cpp b/Client/multiplayer_sa/CMultiplayerSA_DeviceSelection.cpp
@@ -93,17 +93,17 @@ struct RwSubSystemInfo
 };
 
 #define FUNC_rwDeviceSystemRequest 0x7F2AB0
-using rwDeviceSystemRequest = RwSubSystemInfo*(__cdecl*)(void* device, uint32_t requestId, RwSubSystemInfo* pOut, void* pInOut, uint32_t numIn);
+using rwDeviceSystemRequest = RwSubSystemInfo*(__cdecl*)(RwDevice* device, std::int32_t requestId, RwSubSystemInfo* pOut, void* pInOut, std::int32_t numIn);
 static RwSubSystemInfo* RwEngineGetSubSystemInfo_Hooked(RwSubSystemInfo* subSystemInfo, int32_t subSystemIndex)
 {
-    static auto rwDeviceSystemRequestFunc = (rwDeviceSystemRequest)(FUNC_rwDeviceSystemRequest);
-    auto        devicePointer = *(uint32_t*)(0xC97B24);
-    auto        result = rwDeviceSystemRequestFunc((void*)(devicePointer + 0x10), 14, subSystemInfo, nullptr, subSystemIndex);
-    if (result == nullptr)
+    auto        rwGlobals = *(RwGlobals**)(0xC97B24);
+    auto rwDeviceSystemRequestFunc = (rwDeviceSystemRequest)(FUNC_rwDeviceSystemRequest);
+    auto        result = rwDeviceSystemRequestFunc(&rwGlobals->dOpenDevice, 14, subSystemInfo, nullptr, subSystemIndex);
+    if (!result)
         return nullptr;
 
     auto pDxDevice = *(IDirect3D9**)0xC97C20;
-    if (pDxDevice == nullptr)
+    if (!pDxDevice)
         return subSystemInfo;
 
     D3DADAPTER_IDENTIFIER9 identifier;

diff --git a/Client/sdk/game/RenderWare.h b/Client/sdk/game/RenderWare.h
@@ -526,3 +526,49 @@ struct RwError
 {
     int err1, err2;
 };
+
+/*****************************************************************************/
+/** RenderWare Globals                                                      **/
+/*****************************************************************************/
+
+typedef bool (*RwSystemFunc)(std::int32_t, void*, void*, std::int32_t);
+struct RwDevice
+{
+    float        gammaCorrection;
+    RwSystemFunc fpSystem;
+    float        zBufferNear;
+    float        zBufferFar;
+    // RwRenderStateSetFunction             fpRenderStateSet;
+    // RwRenderStateGetFunction             fpRenderStateGet;
+    // RwIm2DRenderLineFunction             fpIm2DRenderLine;
+    // RwIm2DRenderTriangleFunction         fpIm2DRenderTriangle;
+    // RwIm2DRenderPrimitiveFunction        fpIm2DRenderPrimitive;
+    // RwIm2DRenderIndexedPrimitiveFunction fpIm2DRenderIndexedPrimitive;
+    // RwIm3DRenderLineFunction             fpIm3DRenderLine;
+    // RwIm3DRenderTriangleFunction         fpIm3DRenderTriangle;
+    // RwIm3DRenderPrimitiveFunction        fpIm3DRenderPrimitive;
+    // RwIm3DRenderIndexedPrimitiveFunction fpIm3DRenderIndexedPrimitive;
+};
+// static_assert(sizeof(RwDevice) == 0x38, "Incorrect class size: RwGlobals");
+
+typedef bool (*RwStandardFunc)(void*, void*, std::int32_t);
+struct RwGlobals
+{
+    void*               curCamera;
+    void*               curWorld;
+    std::uint16_t       renderFrame;
+    std::uint16_t       lightFrame;
+    std::uint16_t       pad[2];
+    RwDevice            dOpenDevice;
+    RwStandardFunc      stdFunc[29];
+    // RwLinkList          dirtyFrameList;
+    // RwFileFunctions     fileFuncs;
+    // RwStringFunctions   stringFuncs;
+    // RwMemoryFunctions   memoryFuncs;
+    // RwMemoryAllocFn     memoryAlloc;
+    // RwMemoryFreeFn      memoryFree;
+    // RwMetrics*          metrics;
+    // RwEngineStatus      engineStatus;
+    // RwUInt32            resArenaInitSize;
+};
+//static_assert(sizeof(RwGlobals) == 0x158, "Incorrect class size: RwGlobals");