diff --git a/Project Undercover/Assets/Scripts/Guard/GuardController.cs b/Project Undercover/Assets/Scripts/Guard/GuardController.cs index b011004..ff74dff 100755 --- a/Project Undercover/Assets/Scripts/Guard/GuardController.cs +++ b/Project Undercover/Assets/Scripts/Guard/GuardController.cs @@ -42,6 +42,9 @@ public class GuardController : Photon.PunBehaviour { { guardCamera.DisablePreviewMode(); } + + // Prevent the pause menu from appearing. + InGameMenuController.MenuBlocked = true; } /** @@ -65,6 +68,9 @@ public class GuardController : Photon.PunBehaviour { { mCameras[i].EnablePreviewMode(size, i % z, i / z); } + + // Allow the pause menu to appear. + InGameMenuController.MenuBlocked = false; } /** diff --git a/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs b/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs index b4c02a6..9dc258f 100644 --- a/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs +++ b/Project Undercover/Assets/Scripts/UI/InGameMenuController.cs @@ -4,18 +4,32 @@ using UnityEngine; public class InGameMenuController : MonoBehaviour { + public static bool MenuBlocked { get; set; } + public GameObject inGameMenu; - void Update () { - if (Input.GetKeyDown (KeyCode.Escape )) - EscapePressed(); + private void Start() { + MenuBlocked = false; + } + + void Update() { + if (MenuBlocked) { + return; + } + if (Input.GetKeyDown(KeyCode.Escape)) { + EscapePressed(); + } } void EscapePressed() { - inGameMenu.SetActive (true); + if (inGameMenu.GetActive()) { + Resume(); + } else { + inGameMenu.SetActive(true); + } } public void Resume() { - inGameMenu.SetActive (false); + inGameMenu.SetActive(false); } }