From 2ef4f087c5a00b23e93a19e572057a14e8e7d600 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 17 May 2022 01:33:45 +0200
Subject: [PATCH] RPakLoadedInfo_t backwards compatibility

Padded struct with 48 bytes (extra FF padding in memory) to match the size with earlier builds (<S3)
---
 r5dev/rtech/rtech_utils.cpp | 3 ---
 r5dev/rtech/rtech_utils.h   | 7 +++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/r5dev/rtech/rtech_utils.cpp b/r5dev/rtech/rtech_utils.cpp
index bf24c75f..4836199e 100644
--- a/r5dev/rtech/rtech_utils.cpp
+++ b/r5dev/rtech/rtech_utils.cpp
@@ -502,7 +502,6 @@ std::uint8_t __fastcall RTech::DecompressPakFile(RPakDecompState_t* state, std::
 //-----------------------------------------------------------------------------
 RPakLoadedInfo_t RTech::GetPakLoadedInfo(int nPakId)
 {
-#ifdef GAMEDLL_S3
 	for (int i = 0; i < *s_pLoadedPakCount; ++i)
 	{
 		RPakLoadedInfo_t info = g_pLoadedPakInfo[i];
@@ -514,8 +513,6 @@ RPakLoadedInfo_t RTech::GetPakLoadedInfo(int nPakId)
 	}
 
 	Warning(eDLL_T::RTECH, "%s - Failed getting RPakLoadInfo_t for PakId '%d'\n", __FUNCTION__, nPakId);
-#endif // GAMEDLL_S3
-
 	return RPakLoadedInfo_t();
 }
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/rtech/rtech_utils.h b/r5dev/rtech/rtech_utils.h
index 7a84a1e6..c49ed43b 100644
--- a/r5dev/rtech/rtech_utils.h
+++ b/r5dev/rtech/rtech_utils.h
@@ -153,11 +153,14 @@ public:
 	std::uint32_t m_nUnk2; //0x0010
 	std::uint32_t m_nAssetCount; //0x0014
 	char* m_pszFileName; //0x0018
-	void* m_pUnk1; //0x0020
+	void* m_pMalloc; //0x0020
 	std::uint64_t* m_pAssetGuids; //0x0028 size of the array is m_nAssetCount
 	char pad_0030[128]; //0x0030
+#ifndef GAMEDLL_S3
+	char pad_00B0[48];
+#endif // !GAMEDLL_S3
 	std::uint64_t m_nUnkEnd; //0x00B0
-}; //Size: 0x00B8
+}; //Size: 0x00B8/0x00E8
 
 /* ==== RTECH =========================================================================================================================================================== */
 inline RPakLoadedInfo_t* g_pLoadedPakInfo;