added load scene by name method

Eddio0141 · Sep 10, 2024 · 5daa01a · 5daa01a
1 parent 390ab45
commit 5daa01a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/UniTAS/Patcher.Tests/KernelUtils.cs b/UniTAS/Patcher.Tests/KernelUtils.cs
@@ -200,6 +200,10 @@ public void LoadScene(int buildIndex)
         {
         }
 
+        public void LoadScene(string name)
+        {
+        }
+
         public int TotalSceneCount => 0;
         public int ActiveSceneIndex => 0;
         public string ActiveSceneName => "";
@@ -365,4 +369,4 @@ public static Container Init()
 
         return kernel;
     }
-}
+}
diff --git a/UniTAS/Patcher/Implementations/UnitySafeWrappers/SceneManagerWrapper.cs b/UniTAS/Patcher/Implementations/UnitySafeWrappers/SceneManagerWrapper.cs
@@ -39,7 +39,8 @@ public class SceneManagerWrapper : ISceneWrapper
     private readonly Func<string, int, bool, bool, AsyncOperation> _applicationLoadLevelAsync;
 
     // non-async load level
-    private readonly MethodInfo _loadScene;
+    private readonly MethodInfo _loadSceneByIndex;
+    private readonly MethodInfo _loadSceneByName;
 
     private readonly MethodInfo _getActiveScene;
 
@@ -58,7 +59,8 @@ public SceneManagerWrapper(IUnityInstanceWrapFactory unityInstanceWrapFactory)
                 [typeof(string), typeof(int), _loadSceneParametersType, typeof(bool)], null);
         }
 
-        _loadScene = _sceneManager?.GetMethod("LoadScene", AccessTools.all, null, [typeof(int)], null);
+        _loadSceneByIndex = _sceneManager?.GetMethod("LoadScene", AccessTools.all, null, [typeof(int)], null);
+        _loadSceneByName = _sceneManager?.GetMethod("LoadScene", AccessTools.all, null, [typeof(string)], null);
 
         var loadLevelAsync = AccessTools.Method(typeof(Application), "LoadLevelAsync",
             [typeof(string), typeof(int), typeof(bool), typeof(bool)]);
@@ -119,15 +121,26 @@ public void LoadSceneAsync(string sceneName, int sceneBuildIndex, LoadSceneMode
 
     public void LoadScene(int buildIndex)
     {
-        if (_loadScene != null)
+        if (_loadSceneByIndex != null)
         {
-            _loadScene.Invoke(null, [buildIndex]);
+            _loadSceneByIndex.Invoke(null, [buildIndex]);
             return;
         }
 
         Application.LoadLevel(buildIndex);
     }
 
+    public void LoadScene(string name)
+    {
+        if (_loadSceneByName != null)
+        {
+            _loadSceneByName.Invoke(null, [name]);
+            return;
+        }
+
+        Application.LoadLevel(name);
+    }
+
     public int TotalSceneCount => _totalSceneCount?.Invoke() ?? Application.levelCount;
 
     public int ActiveSceneIndex

diff --git a/UniTAS/Patcher/Services/UnitySafeWrappers/Wrappers/ISceneWrapper.cs b/UniTAS/Patcher/Services/UnitySafeWrappers/Wrappers/ISceneWrapper.cs
@@ -8,6 +8,7 @@ void LoadSceneAsync(string sceneName, int sceneBuildIndex, LoadSceneMode loadSce
         LocalPhysicsMode localPhysicsMode, bool mustCompleteNextFrame);
 
     void LoadScene(int buildIndex);
+    void LoadScene(string name);
 
     int TotalSceneCount { get; }