From 8c19cf919af1e299f5296d8410ada500eca14923 Mon Sep 17 00:00:00 2001
From: copygirl <copygirl@mcft.net>
Date: Thu, 15 Apr 2021 15:15:01 +0200
Subject: [PATCH] Prevent movement when escape menu is open

- Add static EscapeMenu.Instance property
---
 src/EscapeMenu.cs  |  4 ++++
 src/LocalPlayer.cs | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/EscapeMenu.cs b/src/EscapeMenu.cs
index 25aa41c..4022631 100644
--- a/src/EscapeMenu.cs
+++ b/src/EscapeMenu.cs
@@ -2,9 +2,13 @@ using Godot;
 
 public class EscapeMenu : Control
 {
+    public static EscapeMenu Instance { get; private set; }
+
     [Export] public NodePath ReturnPath { get; set; }
     public Button Return { get; private set; }
 
+    public EscapeMenu() => Instance = this;
+
     public override void _Ready()
     {
         Return = GetNode<Button>(ReturnPath);
diff --git a/src/LocalPlayer.cs b/src/LocalPlayer.cs
index b619bef..c680c7e 100644
--- a/src/LocalPlayer.cs
+++ b/src/LocalPlayer.cs
@@ -26,16 +26,20 @@ public class LocalPlayer : Player
 
     public override void _PhysicsProcess(float delta)
     {
-        var moveDir = Input.GetActionStrength("move_right") - Input.GetActionStrength("move_left");
+        var moveDir     = 0.0F;
+        var jumpPressed = false;
+        if (!EscapeMenu.Instance.Visible) {
+            moveDir     = Input.GetActionStrength("move_right") - Input.GetActionStrength("move_left");
+            jumpPressed = Input.IsActionJustPressed("move_jump");
+        }
+
         Velocity.x = (moveDir != 0) ? Mathf.Lerp(Velocity.x, moveDir * Speed, Acceleration)
                                      : Mathf.Lerp(Velocity.x, 0, Friction);
         Velocity.y += Gravity * delta;
         Velocity = MoveAndSlide(Velocity, Vector2.Up);
 
-        if (Input.IsActionJustPressed("move_jump"))
-            _jumpPressed = DateTime.Now;
-        if (IsOnFloor())
-            _lastOnFloor = DateTime.Now;
+        if (jumpPressed) _jumpPressed = DateTime.Now;
+        if (IsOnFloor()) _lastOnFloor = DateTime.Now;
 
         if (((DateTime.Now - _jumpPressed) <= JumpEarlyTime) &&
             ((DateTime.Now - _lastOnFloor) <= JumpCoyoteTime)) {