diff options
| -rw-r--r-- | client/game.gd | 5 | ||||
| -rw-r--r-- | client/menu/menu.gd | 3 | ||||
| -rw-r--r-- | client/menu/play.gd | 3 | ||||
| -rw-r--r-- | client/multiplayer.gd | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/client/game.gd b/client/game.gd index f886840d..e7d39aa2 100644 --- a/client/game.gd +++ b/client/game.gd @@ -83,7 +83,7 @@ func _ready(): Global.error_message = reason; get_parent().replace_menu("res://menu/error.tscn") ) - + mp.connect_to_url(menu.data) func handle_packet(p): match p.type: @@ -338,8 +338,7 @@ func handle_packet(p): "environment": $Environment.update(p.effects) "redirect": - Global.server_url = p.uri[0] - get_parent().replace_menu("res://menu/game.tscn") + get_parent().replace_menu("res://menu/game.tscn", p.uri[0]) "replay_start": is_replay = true 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: diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 7e05e759..57031221 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -29,8 +29,10 @@ var socket := WebSocketPeer.new() func _ready(): print("Multiplayer connect"); - socket.connect_to_url(Global.server_url) socket.inbound_buffer_size = 1024 * 1024 * 4 + +func connect_to_url(url): + socket.connect_to_url(url) connected = true func _notification(what): |