diff options
author | Neil Kollack <nkollack@gmail.com> | 2022-04-17 17:48:05 -0500 |
---|---|---|
committer | Neil Kollack <nkollack@gmail.com> | 2022-04-17 17:48:05 -0500 |
commit | 729c9e5b461966381af7c2464712fb8a23a6f4aa (patch) | |
tree | 6fb7a7b8fb351ae90e84d64eb6253a0418614b20 /Assets/Scripts/Actors | |
parent | 5339e773f247bdf81fa3b30a4a03c748732b5046 (diff) |
feat: pause menu + level complete zone
Diffstat (limited to 'Assets/Scripts/Actors')
-rw-r--r-- | Assets/Scripts/Actors/Actor.cs | 12 | ||||
-rw-r--r-- | Assets/Scripts/Actors/Player.cs | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Assets/Scripts/Actors/Actor.cs b/Assets/Scripts/Actors/Actor.cs index 6b82060..30721a5 100644 --- a/Assets/Scripts/Actors/Actor.cs +++ b/Assets/Scripts/Actors/Actor.cs @@ -128,6 +128,18 @@ namespace MontanaJohns.Actors this.grapplePoint = grapplePoint; } + public virtual void Cancel() + { + if (PauseMenu.isPaused) + { + PauseMenu.Resume(); + } + else + { + PauseMenu.Pause(); + } + } + public virtual void AddItem(Item item) { items.Add(item); diff --git a/Assets/Scripts/Actors/Player.cs b/Assets/Scripts/Actors/Player.cs index 8ba1daf..589d661 100644 --- a/Assets/Scripts/Actors/Player.cs +++ b/Assets/Scripts/Actors/Player.cs @@ -16,22 +16,24 @@ namespace MontanaJohns.Actors private Camera _camera; private PlayerInput playerInput; - private InputAction use, move, jump, attack; + private InputAction use, move, jump, attack, cancel; protected override void Awake() { base.Awake(); _camera = FindObjectOfType<Camera>(); playerInput = GetComponent<PlayerInput>(); + use = move = jump = attack = cancel = null; move = playerInput.currentActionMap.FindAction("Move"); jump = playerInput.currentActionMap.FindAction("Jump"); attack = playerInput.currentActionMap.FindAction("Attack"); use = playerInput.currentActionMap.FindAction("Use"); + cancel = playerInput.currentActionMap.FindAction("Cancel"); jump.started += context => Jump(); - use.started += context => Use(); attack.started += context => Fire(); + cancel.started += context => Cancel(); } protected override void Start() |