Added ability to pause the gameController

(And removed debug damage button)
bedder · Nov 28, 2014 · 17bb75e · 17bb75e
1 parent edd099d
commit 17bb75e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs
@@ -141,11 +141,6 @@ void performActions() {
 			//If no enemies in cell, allow to teleport
 			teleportController.teleport();
 		}
-
-        // DEBUG BINDINGS BELOW THIS POINT
-        if (Input.GetButton("DEBUGDAMAGE")) {
-            damage(10);
-        }
     }
 
     public virtual void performClassAction() {

diff --git a/Assets/Scripts/PlayerGUI.cs b/Assets/Scripts/PlayerGUI.cs
@@ -63,6 +63,9 @@ public class PlayerGUI : MonoBehaviour {
     private float displayLevelNumberFor = 2f;
     private float displayLevelNumberUntil;
 
+    private bool paused = false;
+    private float lastPause = 0f;
+
     void Start() {
         goal = GameObject.FindObjectOfType<Goal>();
         countdown = GameObject.FindObjectOfType<TeleportCountdown>();
@@ -170,9 +173,19 @@ void OnGUI() {
             drawText(timer, countdown.timeLeft().ToString("00.0000"), timerStyle, 2);
         GUI.EndGroup();
 
-        if (Time.time < displayLevelNumberUntil) {
+        if (Input.GetButtonDown("Pause") && (Time.realtimeSinceStartup - lastPause) > 0.01f) {
+            paused = !paused;
+            lastPause = Time.realtimeSinceStartup; // TODO: Remove hackyness
+            Time.timeScale = paused ? 0 : 1;
+            Debug.Log("" + paused + "," + Time.timeScale);
+        }
+
+        if (!paused && Time.time < displayLevelNumberUntil) {
             drawText(new Rect(0, 0, Screen.width, Screen.height), "Level " + (gameController.nextLevel - 1), deathMessageStyle, 3);
+        } else if (paused) {
+            drawText(new Rect(0, 0, Screen.width, Screen.height), "Paused", deathMessageStyle, 3);
         }
+
     }
 
     void updateValues() {

diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
@@ -197,11 +197,11 @@ InputManager:
     axis: 0
     joyNum: 0
   - serializedVersion: 3
-    m_Name: DEBUGDAMAGE
+    m_Name: Pause
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: '-'
+    positiveButton: escape
     altNegativeButton: 
     altPositiveButton: 
     gravity: 3