From 69bc0630667f285708ddbb74af8ef83f7a41fc23 Mon Sep 17 00:00:00 2001 From: tpart Date: Wed, 26 Jun 2024 16:08:38 +0200 Subject: Rewrite settings system; Add full controller support to settings; Add menu manager system --- client/menu/main_menu.gd | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'client/menu/main_menu.gd') diff --git a/client/menu/main_menu.gd b/client/menu/main_menu.gd index 31ca5462..5e66646b 100644 --- a/client/menu/main_menu.gd +++ b/client/menu/main_menu.gd @@ -16,25 +16,24 @@ # extends Control -@onready var transition = $SceneTransition -@onready var quick_connect = $side/margin/options/quick_connect +@onready var menu_manager: MenuManager = get_parent() + @onready var quit_button = $side/margin/options/quit @onready var connect_uri = $side/margin/options/connect/uri func _ready(): - quick_connect.grab_focus() if OS.has_feature("web"): quit_button.hide() connect_uri.text = Global.settings["last_server_url"] func _on_quit_pressed(): - transition.quit() + menu_manager.transition.quit() func _on_credits_pressed(): - transition.transition_to("res://menu/credits_menu.tscn") + menu_manager.goto("credits") func _on_connect_pressed(): - var url = $side/margin/options/connect/uri.text + var url = connect_uri.text Global.settings["last_server_url"] = url Global.save_profile() connect_to(url) @@ -52,10 +51,10 @@ func _on_quick_connect_pressed(): func connect_to(url): print("Connecting to %s" % url) Global.server_url = url - transition.transition_to("res://game.tscn") + menu_manager.transition.transition_to("res://game.tscn") func _on_change_character_pressed(): - transition.transition_to("res://menu/character_menu.tscn") + menu_manager.transition.transition_to("res://menu/character_menu.tscn") func _on_settings_pressed(): - transition.transition_to("res://menu/settings_menu.tscn") + menu_manager.goto("settings") -- cgit v1.2.3-70-g09d2