make escape menu actually pause the game

ar1a · Oct 6, 2024 · 34dd597 · 34dd597
1 parent 129e5bd
commit 34dd597
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/default_bus_layout.tres b/default_bus_layout.tres
@@ -1,7 +1,6 @@
 [gd_resource type="AudioBusLayout" format=3 uid="uid://c1l5kcfkfpw77"]
 
 [resource]
-bus/0/mute = true
 bus/0/volume_db = -11.9576
 bus/1/name = &"Music"
 bus/1/solo = false

diff --git a/scenes/autoload/AudioHelpers.tscn b/scenes/autoload/AudioHelpers.tscn
@@ -18,6 +18,7 @@ stream_2/stream = ExtResource("3_w66he")
 script = ExtResource("1_05jao")
 
 [node name="MusicAudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+process_mode = 3
 stream = ExtResource("2_ba6vs")
 volume_db = -5.0
 autoplay = true
@@ -29,6 +30,7 @@ max_polyphony = 3
 bus = &"SFX"
 
 [node name="ClickAudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+process_mode = 3
 stream = ExtResource("5_0muqb")
 bus = &"SFX"
 

diff --git a/scenes/autoload/Cursor.tscn b/scenes/autoload/Cursor.tscn
@@ -4,6 +4,7 @@
 [ext_resource type="Texture2D" uid="uid://brp00fnb7kuo4" path="res://assets/ui/cursor.png" id="1_o5pfb"]
 
 [node name="Cursor" type="CanvasLayer"]
+process_mode = 3
 layer = 10
 script = ExtResource("1_c8wyl")
 

diff --git a/scenes/level/BaseLevel.cs b/scenes/level/BaseLevel.cs
@@ -54,6 +54,7 @@ public override void _UnhandledInput(InputEvent @event)
     {
         if (@event.IsActionPressed(PAUSE_ACTION))
         {
+            GetTree().Paused = true;
             var escapeMenu = escapeMenuScene.Instantiate<EscapeMenu>();
             AddChild(escapeMenu);
             GetViewport().SetInputAsHandled();

diff --git a/scenes/ui/EscapeMenu.cs b/scenes/ui/EscapeMenu.cs
@@ -27,20 +27,30 @@ public override void _Ready()
 
         AudioHelpers.RegisterButtons(new Button[] { quitButton, resumeButton, optionsButton });
 
-        quitButton.Pressed += () => GetTree().ChangeSceneToFile(mainMenuScenePath);
-        resumeButton.Pressed += QueueFree;
+        quitButton.Pressed += () =>
+        {
+            GetTree().Paused = false;
+            GetTree().ChangeSceneToFile(mainMenuScenePath);
+        };
+        resumeButton.Pressed += CloseMenu;
         optionsButton.Pressed += OnOptionsButtonPressed;
     }
 
     public override void _UnhandledInput(InputEvent @event)
     {
         if (@event.IsActionPressed(PAUSE_ACTION))
         {
-            QueueFree();
+            CloseMenu();
             GetViewport().SetInputAsHandled();
         }
     }
 
+    private void CloseMenu()
+    {
+        GetTree().Paused = false;
+        QueueFree();
+    }
+
     private void OnOptionsButtonPressed()
     {
         marginContainer.Visible = false;

diff --git a/scenes/ui/EscapeMenu.tscn b/scenes/ui/EscapeMenu.tscn
@@ -4,6 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://b2pwlhr1ygp6j" path="res://scenes/ui/OptionsMenu.tscn" id="2_i1tjj"]
 
 [node name="EscapeMenu" type="CanvasLayer"]
+process_mode = 2
 layer = 2
 script = ExtResource("1_s4367")
 mainMenuScenePath = "res://scenes/ui/MainMenu.tscn"