From 0f7e3ced25ee1138980f4ddfcb37e45fbc54bead Mon Sep 17 00:00:00 2001
From: Andrew Lee <alee14498@protonmail.com>
Date: Sat, 5 Dec 2020 13:18:39 -0500
Subject: Discord RPC; Removed jumping function for now

---
 Assets/Input/PlayerControls.cs           | 26 +++++++++++++-------------
 Assets/Input/PlayerControls.inputactions |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'Assets/Input')

diff --git a/Assets/Input/PlayerControls.cs b/Assets/Input/PlayerControls.cs
index 4a60a06..1025547 100644
--- a/Assets/Input/PlayerControls.cs
+++ b/Assets/Input/PlayerControls.cs
@@ -43,7 +43,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable
                     ""interactions"": """"
                 },
                 {
-                    ""name"": ""UnlockCursor"",
+                    ""name"": ""Pause"",
                     ""type"": ""Button"",
                     ""id"": ""9245a8ae-c817-4f60-9b78-f639dd4a52f0"",
                     ""expectedControlType"": ""Button"",
@@ -242,11 +242,11 @@ public class @PlayerControls : IInputActionCollection, IDisposable
                 {
                     ""name"": """",
                     ""id"": ""5fe61161-b433-47e3-b01b-f299068b92ae"",
-                    ""path"": ""<Keyboard>/f1"",
+                    ""path"": ""<Keyboard>/escape"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""Keyboard and Mouse"",
-                    ""action"": ""UnlockCursor"",
+                    ""action"": ""Pause"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 }
@@ -288,7 +288,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable
         m_Gameplay_Move = m_Gameplay.FindAction("Move", throwIfNotFound: true);
         m_Gameplay_Jump = m_Gameplay.FindAction("Jump", throwIfNotFound: true);
         m_Gameplay_Look = m_Gameplay.FindAction("Look", throwIfNotFound: true);
-        m_Gameplay_UnlockCursor = m_Gameplay.FindAction("UnlockCursor", throwIfNotFound: true);
+        m_Gameplay_Pause = m_Gameplay.FindAction("Pause", throwIfNotFound: true);
     }
 
     public void Dispose()
@@ -341,7 +341,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable
     private readonly InputAction m_Gameplay_Move;
     private readonly InputAction m_Gameplay_Jump;
     private readonly InputAction m_Gameplay_Look;
-    private readonly InputAction m_Gameplay_UnlockCursor;
+    private readonly InputAction m_Gameplay_Pause;
     public struct GameplayActions
     {
         private @PlayerControls m_Wrapper;
@@ -349,7 +349,7 @@ public class @PlayerControls : IInputActionCollection, IDisposable
         public InputAction @Move => m_Wrapper.m_Gameplay_Move;
         public InputAction @Jump => m_Wrapper.m_Gameplay_Jump;
         public InputAction @Look => m_Wrapper.m_Gameplay_Look;
-        public InputAction @UnlockCursor => m_Wrapper.m_Gameplay_UnlockCursor;
+        public InputAction @Pause => m_Wrapper.m_Gameplay_Pause;
         public InputActionMap Get() { return m_Wrapper.m_Gameplay; }
         public void Enable() { Get().Enable(); }
         public void Disable() { Get().Disable(); }
@@ -368,9 +368,9 @@ public class @PlayerControls : IInputActionCollection, IDisposable
                 @Look.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnLook;
                 @Look.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnLook;
                 @Look.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnLook;
-                @UnlockCursor.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnUnlockCursor;
-                @UnlockCursor.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnUnlockCursor;
-                @UnlockCursor.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnUnlockCursor;
+                @Pause.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
+                @Pause.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
+                @Pause.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
             }
             m_Wrapper.m_GameplayActionsCallbackInterface = instance;
             if (instance != null)
@@ -384,9 +384,9 @@ public class @PlayerControls : IInputActionCollection, IDisposable
                 @Look.started += instance.OnLook;
                 @Look.performed += instance.OnLook;
                 @Look.canceled += instance.OnLook;
-                @UnlockCursor.started += instance.OnUnlockCursor;
-                @UnlockCursor.performed += instance.OnUnlockCursor;
-                @UnlockCursor.canceled += instance.OnUnlockCursor;
+                @Pause.started += instance.OnPause;
+                @Pause.performed += instance.OnPause;
+                @Pause.canceled += instance.OnPause;
             }
         }
     }
@@ -414,6 +414,6 @@ public class @PlayerControls : IInputActionCollection, IDisposable
         void OnMove(InputAction.CallbackContext context);
         void OnJump(InputAction.CallbackContext context);
         void OnLook(InputAction.CallbackContext context);
-        void OnUnlockCursor(InputAction.CallbackContext context);
+        void OnPause(InputAction.CallbackContext context);
     }
 }
diff --git a/Assets/Input/PlayerControls.inputactions b/Assets/Input/PlayerControls.inputactions
index e18714b..298c04e 100644
--- a/Assets/Input/PlayerControls.inputactions
+++ b/Assets/Input/PlayerControls.inputactions
@@ -30,7 +30,7 @@
                     "interactions": ""
                 },
                 {
-                    "name": "UnlockCursor",
+                    "name": "Pause",
                     "type": "Button",
                     "id": "9245a8ae-c817-4f60-9b78-f639dd4a52f0",
                     "expectedControlType": "Button",
@@ -229,11 +229,11 @@
                 {
                     "name": "",
                     "id": "5fe61161-b433-47e3-b01b-f299068b92ae",
-                    "path": "<Keyboard>/f1",
+                    "path": "<Keyboard>/escape",
                     "interactions": "",
                     "processors": "",
                     "groups": "Keyboard and Mouse",
-                    "action": "UnlockCursor",
+                    "action": "Pause",
                     "isComposite": false,
                     "isPartOfComposite": false
                 }
-- 
cgit v1.2.3