additional cutscene frame limiter

- fixes #303
ThirteenAG · Jan 25, 2024 · e054ba5 · e054ba5
1 parent 8114261
commit e054ba5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/source/comvars.ixx b/source/comvars.ixx
@@ -20,6 +20,7 @@ export uint32_t* rage__scrEngine__ms_dwNativeTableSize;
 export uint32_t** rage__scrEngine__ms_pNatives;
 export uintptr_t** rage__scrProgram__ms_pGlobals;
 export uint32_t* rage__scrProgram__ms_pGlobalsSize;
+export uint32_t* CCutscenes__m_dwCutsceneState;
 export void* (__stdcall* getNativeAddress)(uint32_t);
 export float* fTimeStep;
 export HWND gWnd;
@@ -102,6 +103,9 @@ public:
 
             pattern = hook::pattern("BE ? ? ? ? 8D 44 24 0C 50 8D 46 10 50");
             pCGameConfigReader__ms_imgFiles = *pattern.get_first<decltype(pCGameConfigReader__ms_imgFiles)>(1);
+
+            pattern = hook::pattern("A1 ? ? ? ? 83 F8 08 74 05");
+            CCutscenes__m_dwCutsceneState = *pattern.get_first<uint32_t*>(1);
         };
     }
 } Common;
diff --git a/source/framelimit.ixx b/source/framelimit.ixx
@@ -129,6 +129,7 @@ FrameLimiter FpsLimiter;
 FrameLimiter CutsceneFpsLimiter;
 FrameLimiter ScriptCutsceneFpsLimiter;
 FrameLimiter LoadingFpsLimiter;
+FrameLimiter LoadingFpsLimiter2;
 bool(*CCutscenes__hasCutsceneFinished)();
 bool(*CCamera__isWidescreenBordersActive)();
 bool bUnlockFramerateDuringLoadscreens = true;
@@ -147,10 +148,19 @@ void __cdecl sub_855640()
     if (CCamera__isWidescreenBordersActive())
     {
         if (CCutscenes__hasCutsceneFinished())
+        {
             if (fCutsceneFpsLimit)
                 CutsceneFpsLimiter.Sync();
             else if (fScriptCutsceneFpsLimit)
                 ScriptCutsceneFpsLimiter.Sync();
+
+            // To avoid more softlocks with high fps
+            if (!fCutsceneFpsLimit && CCutscenes__m_dwCutsceneState)
+            {
+                if (*CCutscenes__m_dwCutsceneState == 9 || *CCutscenes__m_dwCutsceneState == 10)
+                    LoadingFpsLimiter2.Sync();
+            }
+        }
     }
 }
 
@@ -193,6 +203,7 @@ public:
                 CutsceneFpsLimiter.Init(mode, fCutsceneFpsLimit);
                 ScriptCutsceneFpsLimiter.Init(mode, fScriptCutsceneFpsLimit);
                 LoadingFpsLimiter.Init(mode, std::clamp(fLoadingFpsLimit, 30.0f, FLT_MAX));
+                LoadingFpsLimiter2.Init(mode, 240.0f);
 
                 auto pattern = find_pattern("E8 ? ? ? ? 84 C0 75 89", "E8 ? ? ? ? 84 C0 75 15 38 05");
                 CCutscenes__hasCutsceneFinished = (bool(*)()) injector::GetBranchDestination(pattern.get_first(0)).get();