summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pause_menu.gd7
-rw-r--r--pause_menu_status.gd10
-rw-r--r--pause_menu_system.gd8
3 files changed, 10 insertions, 15 deletions
diff --git a/pause_menu.gd b/pause_menu.gd
index ce09867..55605a7 100644
--- a/pause_menu.gd
+++ b/pause_menu.gd
@@ -1,7 +1,7 @@
class_name PauseMenu
extends CanvasLayer
-var active_page_index: int
+var active_page_index: int = -1
var pages: Array[PauseMenuPage] = []
func _ready():
@@ -34,8 +34,9 @@ func get_map() -> PauseMenuMap:
return null
func set_page(i: int):
- var prev_page = pages[active_page_index]
- remove_child.call_deferred(prev_page)
+ if active_page_index != -1:
+ var prev_page = pages[active_page_index]
+ remove_child.call_deferred(prev_page)
active_page_index = i
add_child.call_deferred(pages[i])
diff --git a/pause_menu_status.gd b/pause_menu_status.gd
index 8411909..fc108e1 100644
--- a/pause_menu_status.gd
+++ b/pause_menu_status.gd
@@ -1,12 +1,2 @@
class_name PauseMenuStatus
extends PauseMenuPage
-
-
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
- pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
- pass
diff --git a/pause_menu_system.gd b/pause_menu_system.gd
index 910823b..75d211e 100644
--- a/pause_menu_system.gd
+++ b/pause_menu_system.gd
@@ -1,10 +1,14 @@
class_name PauseMenuSystem
extends PauseMenuPage
-func _on_tree_entered() -> void:
- $QuitButton.grab_focus.call_deferred()
+func _ready():
$QuitButton.connect("pressed", _on_quit_button_pressed)
+func _on_tree_entered() -> void:
+ if is_node_ready():
+ $QuitButton.grab_focus.call_deferred()
+
+
func _on_quit_button_pressed() -> void:
var menu: PauseMenu = get_parent()
var top: Top = menu.get_parent()