From 3ea5ec1d5e68c47e2861da5c7301e80d6980c57f Mon Sep 17 00:00:00 2001 From: Marvin D <41352111+IcePixelx@users.noreply.github.com> Date: Sun, 30 Oct 2022 23:05:37 +0100 Subject: [PATCH] Move deadlock check. --- r5dev/rtech/rtech_utils.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/r5dev/rtech/rtech_utils.cpp b/r5dev/rtech/rtech_utils.cpp index 4c3cd933..752ec6aa 100644 --- a/r5dev/rtech/rtech_utils.cpp +++ b/r5dev/rtech/rtech_utils.cpp @@ -746,8 +746,6 @@ void RTech::PakProcessGuidRelationsForAsset(PakFile_t* pPak, RPakAssetEntry* pAs } assetIdx++; - assetIdx &= 0x3FFFF; - assetIdxEntryGuid = g_pUnknownPakStruct->m_Assets[assetIdx].m_Guid; // Check if we have a deadlock and report it if we have rtech_debug enabled. if (rtech_debug->GetBool() && assetIdx > 0x40000) @@ -757,6 +755,9 @@ void RTech::PakProcessGuidRelationsForAsset(PakFile_t* pPak, RPakAssetEntry* pAs DebugBreak(); } + assetIdx &= 0x3FFFF; + assetIdxEntryGuid = g_pUnknownPakStruct->m_Assets[assetIdx].m_Guid; + if (assetIdxEntryGuid == currentGuid) return true; }