Fix some places misusing unitask async

RadratSoftworks · Mar 27, 2023 · df2caf9 · df2caf9
1 parent 71eab85
commit df2caf9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Assets/Scripts/Action/ActionInterpreter.cs b/Assets/Scripts/Action/ActionInterpreter.cs
@@ -110,11 +110,11 @@ public IEnumerator Execute(ScriptBlock<ActionOpcode> block) => UniTask.ToCorouti
                         break;
 
                     case ActionOpcode.LoadMiniGame:
-                        RunLoadMiniGame(command);
+                        await RunLoadMiniGame(command);
                         break;
 
                     case ActionOpcode.ResumeSave:
-                        RunResumeSave(command);
+                        await RunResumeSave(command);
                         break;
 
                     case ActionOpcode.SwitchNgi:
@@ -173,15 +173,15 @@ private IEnumerator RunLoadLocation(ScriptCommand<ActionOpcode> command) => UniT
             await GameManager.Instance.LoadControlSet(command.Arguments[0] as string);
         });
 
-        private void RunLoadMiniGame(ScriptCommand<ActionOpcode> command)
+        private async UniTask RunLoadMiniGame(ScriptCommand<ActionOpcode> command)
         {
             if (command.Arguments.Count == 0)
             {
                 Debug.LogError("Not enough argument for load minigame!");
                 return;
             }
 
-            GameManager.Instance.LoadMinigame(command.Arguments[0] as string);
+            await GameManager.Instance.LoadMinigame(command.Arguments[0] as string);
         }
 
         private void RunSetLocationOffset(ScriptCommand<ActionOpcode> command)
@@ -212,9 +212,9 @@ private void RunPanLocation(ScriptCommand<ActionOpcode> command)
             GameManager.Instance.PanControlSet(amount);
         }
 
-        private void RunResumeSave(ScriptCommand<ActionOpcode> command)
+        private async UniTask RunResumeSave(ScriptCommand<ActionOpcode> command)
         {
-            GameManager.Instance.LoadGame();
+            await GameManager.Instance.LoadGame();
         }
 
         private void RunSwitchNgi(ScriptCommand<ActionOpcode> command)

diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
@@ -490,7 +490,7 @@ public async UniTask LoadControlSet(string filename)
             }
         }
 
-        public async void LoadMinigame(string filename)
+        public async UniTask LoadMinigame(string filename)
         {
             ResourceFile resourcesToLoadFrom = ResourceManager.Instance.GeneralResources;
             if (!resourcesToLoadFrom.Exists(filename))
@@ -678,7 +678,7 @@ private void LoadSingleGadget(string gadgetPath, int gadgetId)
             }
         }
 
-        private async void InitializeFromGameSave()
+        private async UniTask InitializeFromGameSave()
         {
             inLoad = true;
 
@@ -695,7 +695,7 @@ private async void InitializeFromGameSave()
             {
                 if (Path.GetExtension(gameSave.CurrentControlSetPath).Equals(FilePaths.MinigameFileExtension, StringComparison.OrdinalIgnoreCase))
                 {
-                    LoadMinigame(gameSave.CurrentControlSetPath);
+                    await LoadMinigame(gameSave.CurrentControlSetPath);
                 }
                 else
                 {
@@ -725,7 +725,7 @@ private async void InitializeFromGameSave()
             RestoreGameSaveTracking();
         }
 
-        public void LoadGame()
+        public async UniTask LoadGame()
         {
             using (StreamReader file = File.OpenText(SavePath))
             {
@@ -740,7 +740,7 @@ public void LoadGame()
 
             if (gameSave != null)
             {
-                InitializeFromGameSave();
+                await InitializeFromGameSave();
             }
         }