ada/project-undercover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now preventing pause from being opened in camera zoom-in.

Browse source
This commit is contained in:
Randall 2017-11-30 12:04:40 -06:00
parent 2919692ed4
commit 90144e086f
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Project Undercover/Assets/Scripts/Guard/GuardController.cs
View file

@ -42,6 +42,9 @@ public class GuardController : Photon.PunBehaviour {
{ {
guardCamera.DisablePreviewMode(); 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); mCameras[i].EnablePreviewMode(size, i % z, i / z);
} }
// Allow the pause menu to appear.
InGameMenuController.MenuBlocked = false;
} }
/** /**

24
Project Undercover/Assets/Scripts/UI/InGameMenuController.cs
View file

@ -4,18 +4,32 @@ using UnityEngine;
public class InGameMenuController : MonoBehaviour { public class InGameMenuController : MonoBehaviour {
public static bool MenuBlocked { get; set; }
public GameObject inGameMenu; public GameObject inGameMenu;
void Update () { private void Start() {
if (Input.GetKeyDown (KeyCode.Escape )) MenuBlocked = false;
EscapePressed(); }
void Update() {
if (MenuBlocked) {
return;
}
if (Input.GetKeyDown(KeyCode.Escape)) {
EscapePressed();
}
} }
void EscapePressed() { void EscapePressed() {
inGameMenu.SetActive (true); if (inGameMenu.GetActive()) {
Resume();
} else {
inGameMenu.SetActive(true);
}
} }
public void Resume() { public void Resume() {
inGameMenu.SetActive (false); inGameMenu.SetActive(false);
} }
} }