fix being able to pause in the gameover screen

user5522 · Jan 2, 2025 · 36e006f · 36e006f
1 parent a3b5dee
commit 36e006f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
@@ -7,6 +7,9 @@ public class GameManager : MonoBehaviour
 
     public UnitHealth playerHealth = new UnitHealth(100, 100);
 
+    public bool isGameOver;
+    public bool isPaused;
+
     bool waiting;
     float previousTimescale;
 

diff --git a/Assets/Scripts/GameOverScreen.cs b/Assets/Scripts/GameOverScreen.cs
@@ -12,6 +12,7 @@ public class GameOverScreen : MonoBehaviour
 
     void Start()
     {
+        GameManager.Instance.isGameOver = true;
         player.SetActive(false);
         StartCoroutine(FlashText());
         Time.timeScale = 1;
@@ -21,6 +22,7 @@ void Update()
     {
         if (Input.GetKeyDown(KeyCode.R))
         {
+            GameManager.Instance.isGameOver = false;
             gameObject.SetActive(false);
             player.SetActive(true);
             SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);

diff --git a/Assets/Scripts/Pause.cs b/Assets/Scripts/Pause.cs
@@ -6,8 +6,6 @@ public class Pause : MonoBehaviour
 
     private float previousTimeScale;
 
-    public static bool isPaused = false;
-
     void Start() => previousTimeScale = Time.timeScale;
 
     void Update()
@@ -17,22 +15,22 @@ void Update()
 
     public void TogglePause()
     {
-        if (Time.timeScale > 0)
+        if (Time.timeScale > 0 && !GameManager.Instance.isGameOver)
         {
             previousTimeScale = Time.timeScale;
             Time.timeScale = 0;
             AudioListener.pause = true; // for audio whenever that gets added
             pauseMenu.SetActive(true);
 
-            isPaused = true;
+            GameManager.Instance.isPaused = true;
         }
-        else if (Time.timeScale == 0)
+        else if (Time.timeScale == 0 && !GameManager.Instance.isGameOver)
         {
             Time.timeScale = previousTimeScale;
             AudioListener.pause = false; // for audio whenever that gets added
             pauseMenu.SetActive(false);
 
-            isPaused = false;
+            GameManager.Instance.isPaused = false;
         }
     }
 

diff --git a/Assets/Scripts/SettingsManager.cs b/Assets/Scripts/SettingsManager.cs
@@ -48,7 +48,7 @@ private void LoadSettings()
 
     private void UpdateCursorVisibility()
     {
-        Cursor.visible = Pause.isPaused;
-        Cursor.lockState = Pause.isPaused ? CursorLockMode.None : CursorLockMode.Locked;
+        Cursor.visible = GameManager.Instance.isPaused;
+        Cursor.lockState = GameManager.Instance.isPaused ? CursorLockMode.None : CursorLockMode.Locked;
     }
 }
diff --git a/Assets/Scripts/SlowDownTime.cs b/Assets/Scripts/SlowDownTime.cs
@@ -32,13 +32,13 @@ void Start()
 
     void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Tab) && !Pause.isPaused) ToggleSlowMotion();
-        if (isSlowMotion && !Pause.isPaused)
+        if (Input.GetKeyDown(KeyCode.Tab) && !GameManager.Instance.isPaused) ToggleSlowMotion();
+        if (isSlowMotion && !GameManager.Instance.isPaused)
         {
             availableSlowdownTime -= Time.unscaledDeltaTime;
             if (availableSlowdownTime <= 0) ToggleSlowMotion();
         }
-        else if (!Pause.isPaused) RechargeSlowdownTime();
+        else if (!GameManager.Instance.isPaused) RechargeSlowdownTime();
         UpdateUI();
         HandleGamePaused();
     }
@@ -96,7 +96,7 @@ void SetDimming(bool enabled)
 
     void HandleGamePaused()
     {
-        if (Pause.isPaused && isSlowMotion) Time.timeScale = 0f;
+        if (GameManager.Instance.isPaused && isSlowMotion) Time.timeScale = 0f;
     }
 
     void UpdateUI() => bar.fillAmount = availableSlowdownTime / maxSlowdownTime;

diff --git a/Assets/Scripts/WeaponController.cs b/Assets/Scripts/WeaponController.cs
@@ -18,7 +18,7 @@ public class WeaponController : MonoBehaviour
 
     void Update()
     {
-        if (Pause.isPaused) return;
+        if (GameManager.Instance.isPaused) return;
 
         if (Input.GetMouseButtonDown(0))
         {