Store Origins check as a variable

Helps to reduce lag on lower-end platforms
RSDKModding · Jun 24, 2024 · 88e8aba · 88e8aba
1 parent 3541d09
commit 88e8aba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/RSDKv4/Drawing.cpp b/RSDKv4/Drawing.cpp
@@ -1232,7 +1232,7 @@ void DrawStageGFX()
 #if RETRO_REV03
 #if !RETRO_USE_ORIGINAL_CODE
         // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
-        if (forceUseScripts || GetGlobalVariableID("game.playMode") != 0xFF)
+        if (forceUseScripts || Engine.usingOrigins)
 #endif
             DrawObjectList(7);
 #endif

diff --git a/RSDKv4/RetroEngine.cpp b/RSDKv4/RetroEngine.cpp
@@ -1315,6 +1315,10 @@ bool RetroEngine::LoadGameConfig(const char *filePath)
         startList_Game  = STAGELIST_BONUS;
         startStage_Game = 0xFE;
     }
+
+#if RETRO_REV03
+    Engine.usingOrigins = GetGlobalVariableID("game.playMode") != 0xFF;
+#endif
 #endif
 
     return loaded;

diff --git a/RSDKv4/RetroEngine.hpp b/RSDKv4/RetroEngine.hpp
@@ -366,6 +366,9 @@ class RetroEngine
 #endif
     bool usingDataFile = false;
     bool usingBytecode = false;
+#if RETRO_REV03 && !RETRO_USE_ORIGINAL_CODE
+    bool usingOrigins = false;
+#endif
 
     char dataFile[RETRO_PACKFILE_COUNT][0x80];
 

diff --git a/RSDKv4/Scene.cpp b/RSDKv4/Scene.cpp
@@ -301,7 +301,7 @@ void ProcessStage(void)
 #if RETRO_REV03
 #if !RETRO_USE_ORIGINAL_CODE
             // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
-            if (forceUseScripts || GetGlobalVariableID("game.playMode") != 0xFF)
+            if (forceUseScripts || Engine.usingOrigins)
 #endif
                 DrawObjectList(7);
 #endif
@@ -482,7 +482,7 @@ void ProcessStage(void)
 #if RETRO_REV03
 #if !RETRO_USE_ORIGINAL_CODE
                 // Hacky fix for Tails Object not working properly in special stages on non-Origins bytecode
-                if (forceUseScripts || GetGlobalVariableID("game.playMode") != 0xFF)
+                if (forceUseScripts || Engine.usingOrigins)
 #endif
                     DrawObjectList(7);
 #endif

diff --git a/RSDKv4/Script.cpp b/RSDKv4/Script.cpp
@@ -3392,7 +3392,7 @@ void ProcessScript(int scriptCodeStart, int jumpTableStart, byte scriptEvent)
 #if RETRO_REV03 && !RETRO_USE_ORIGINAL_CODE
                 bool inputCheck = true; // Default to true for mobile bytecode
                 // If we're using the scripts or an Origins datafile, check the array value
-                if (forceUseScripts || GetGlobalVariableID("game.playMode") != 0xFF)
+                if (forceUseScripts || Engine.usingOrigins)
                     inputCheck = arrayVal <= 1;
 #endif
 
@@ -5677,7 +5677,7 @@ void ProcessScript(int scriptCodeStart, int jumpTableStart, byte scriptEvent)
 #if RETRO_REV03 && !RETRO_USE_ORIGINAL_CODE
                 bool inputCheck = true; // Default to true for mobile bytecode
                 // If we're using the scripts or an Origins datafile, check the array value
-                if (forceUseScripts || GetGlobalVariableID("game.playMode") != 0xFF)
+                if (forceUseScripts || Engine.usingOrigins)
                     inputCheck = arrayVal <= 1;
 #endif