Better scene management to avoid breaking everything if a scene is re…

…named
Torbilicious · Jan 28, 2019 · 74713d4 · 74713d4
1 parent 8f77dcf
commit 74713d4
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 12 deletions.
diff --git a/Unity/Assets/Scripts/Enemies/PlayerBehaviour.cs b/Unity/Assets/Scripts/Enemies/PlayerBehaviour.cs
@@ -152,7 +152,7 @@ public void Die()
 
     public void winLevel()
     {
-        SceneManager.LoadScene("WinMenu");
+        SceneManager.LoadScene(Scene.MENU_WIN);
     }
 
     public void TeleportTo(DropTile tile)

diff --git a/Unity/Assets/Scripts/SceneManagement/Scene.cs b/Unity/Assets/Scripts/SceneManagement/Scene.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public enum Scene
+{
+    MENU_MAIN,
+    MENU_CREDITS,
+    MENU_WIN,
+
+}
diff --git a/Unity/Assets/Scripts/SceneManagement/Scene.cs.meta b/Unity/Assets/Scripts/SceneManagement/Scene.cs.meta
diff --git a/Unity/Assets/Scripts/SceneManagement/SceneManagerExtensions.cs b/Unity/Assets/Scripts/SceneManagement/SceneManagerExtensions.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public static class SceneManager
+{
+    public static void LoadScene(Scene scene)
+    {
+        switch(scene)
+        {
+            case Scene.MENU_MAIN:
+                UnityEngine.SceneManagement.SceneManager.LoadScene("MainMenu");
+                break;
+            case Scene.MENU_CREDITS:
+                UnityEngine.SceneManagement.SceneManager.LoadScene("CreditMenu");
+                break;
+            case Scene.MENU_WIN:
+                UnityEngine.SceneManagement.SceneManager.LoadScene("WinMenu");
+                break;
+        }
+    }
+}
diff --git a/Unity/Assets/Scripts/SceneManagement/SceneManagerExtensions.cs.meta b/Unity/Assets/Scripts/SceneManagement/SceneManagerExtensions.cs.meta
diff --git a/Unity/Assets/Scripts/UIScripts/Credit.cs b/Unity/Assets/Scripts/UIScripts/Credit.cs
@@ -9,15 +9,15 @@ void Update()
     {
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            SceneManager.LoadScene("MainMenu");
+            SceneManager.LoadScene(Scene.MENU_MAIN);
         }
 
 
     }
 
     public void LoadMenu()
     {
-        SceneManager.LoadScene("MainMenu");
+        SceneManager.LoadScene(Scene.MENU_MAIN);
     }
 
 }
diff --git a/Unity/Assets/Scripts/UIScripts/GameOver.cs b/Unity/Assets/Scripts/UIScripts/GameOver.cs
@@ -26,7 +26,7 @@ public void Show()
 
     public void Retry()
     {
-        SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+        UnityEngine.SceneManagement.SceneManager.LoadScene(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name);
         canvas.SetActive(false);
     }
 }
diff --git a/Unity/Assets/Scripts/UIScripts/GameUI.cs b/Unity/Assets/Scripts/UIScripts/GameUI.cs
@@ -11,7 +11,7 @@ public class GameUI : MonoBehaviour
     // Start is called before the first frame update
     public void ReloadScene()
     {
-        SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+        UnityEngine.SceneManagement.SceneManager.LoadScene(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name);
     }
 
     public void LoadPause()

diff --git a/Unity/Assets/Scripts/UIScripts/MainMenu.cs b/Unity/Assets/Scripts/UIScripts/MainMenu.cs
@@ -14,12 +14,12 @@ public void Play()
         }
 
         GameState.Reset();
-        SceneManager.LoadScene("Level 1");
+        UnityEngine.SceneManagement.SceneManager.LoadScene("Level 1");
     }
 
     public void LoadCredits()
     {
-        SceneManager.LoadScene("CreditMenu");
+        SceneManager.LoadScene(Scene.MENU_CREDITS);
     }
 
     public void QuitGame()

diff --git a/Unity/Assets/Scripts/UIScripts/PauseMenu.cs b/Unity/Assets/Scripts/UIScripts/PauseMenu.cs
@@ -51,7 +51,7 @@ public void Resume()
     public void LoadMenu()
     {
         Time.timeScale = 1f;
-        SceneManager.LoadScene("SplashScreen");
+        SceneManager.LoadScene(Scene.MENU_MAIN);
     }
 
     public void Pause()

diff --git a/Unity/Assets/Scripts/UIScripts/Win.cs b/Unity/Assets/Scripts/UIScripts/Win.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 public class Win : MonoBehaviour
 {
@@ -11,14 +10,14 @@ public void LoadNextLevel()
     {
         if(GameState.nexLevel >= 0) 
         {
-            SceneManager.LoadScene("Level " + GameState.nexLevel);
+            UnityEngine.SceneManagement.SceneManager.LoadScene("Level " + GameState.nexLevel);
         }else{
-            SceneManager.LoadScene("CreditMenu");
+            SceneManager.LoadScene(Scene.MENU_CREDITS);
         }
     }
 
     public void BackToMenu()
     {
-        SceneManager.LoadScene("MainMenu");
+        SceneManager.LoadScene(Scene.MENU_MAIN);
     }
 }