From c4ffbb16598b15be14970382e05c2d1795e13820 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 22 Dec 2024 22:45:34 +0100 Subject: replace server_url global variable with menu data --- client/menu/menu.gd | 3 ++- client/menu/play.gd | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'client/menu') diff --git a/client/menu/menu.gd b/client/menu/menu.gd index 7f4a1fb6..2e63a1fe 100644 --- a/client/menu/menu.gd +++ b/client/menu/menu.gd @@ -85,12 +85,13 @@ func quit(): await exit() get_parent().quit() -func replace_menu(path: String): +func replace_menu(path: String, data_ = null): print("Replace menu: ", path) if popup != null: await popup.exit() _disable_recursive(self, true) await _menu_exit() var new_popup = load(path).instantiate() + new_popup.data = data_ get_parent().add_child(new_popup) if parent_menu != null: parent_menu.popup = new_popup queue_free() diff --git a/client/menu/play.gd b/client/menu/play.gd index 3297aa6d..50e8a633 100644 --- a/client/menu/play.gd +++ b/client/menu/play.gd @@ -125,8 +125,7 @@ func _on_quick_connect_pressed(): func connect_to(url: String): print("Connecting to %s" % url) - Global.server_url = url - get_parent().replace_menu("res://menu/game.tscn") + get_parent().replace_menu("res://menu/game.tscn", url) func _on_server_pressed(): match Server.state: -- cgit v1.2.3-70-g09d2