From aec30a8047b3eb955ea71538ab1b57904cf96138 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:44:42 +0100 Subject: [PATCH] Slight fix for CGlobalVarsBase Fixed offsets for 'm_fCurTime' and 'm_fFrameTime'. --- r5dev/public/edict.h | 2 +- r5dev/public/globalvars_base.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/r5dev/public/edict.h b/r5dev/public/edict.h index ab3e7b2f..169aea69 100644 --- a/r5dev/public/edict.h +++ b/r5dev/public/edict.h @@ -34,7 +34,7 @@ public: MapLoadType_t m_eLoadType; // How the current map was loaded. bool m_bMapLoadFailed; // Map has failed to load, we need to kick back to the main menu (unused?). - SHORT* m_pUnk0; // r5apex_ds.exe 'CBaseServer::Clear() + 0x7E' + SHORT* m_pInterlock; // r5apex_ds.exe 'CBaseServer::Clear() + 0x7E' void* m_pUnk1; // r5apex_ds.exe 'CBaseServer::Clear() + 0x93' void* m_pUnk2; // r5apex_ds.exe 'CServer::FrameJob() + 0x20' void* m_pUnk3; diff --git a/r5dev/public/globalvars_base.h b/r5dev/public/globalvars_base.h index 6cf986e0..1883a401 100644 --- a/r5dev/public/globalvars_base.h +++ b/r5dev/public/globalvars_base.h @@ -20,11 +20,12 @@ public: float m_nUnkTime; float m_rRealTime; // Absolute time (per frame still - Use Plat_FloatTime() for a high precision real time. int m_nFrameCount; // Absolute frame counter - continues to increase even if game is paused - never resets. + int m_nSomeTick; + float m_fCurTime; float m_fAbsoluteFrameTime; // Non-paused frametime float m_fAbsoluteFrameStartTimeStdDev; + char m_nPad0[20]; // All unknown. float m_fFrameTime; // Time spent on last server or client frame (has nothing to do with think intervals) (Also empty on dedicated) - float m_fCurTime; - char m_nPad0[24]; // All unknown. int m_nMaxMilesAudioQueues; // Only used on the server. int m_nMaxClients; // Current maxplayers setting GameMode_t m_nGameMode; // 1 (MP) 2 (PVE) 3 (SP)