diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-12 01:30:53 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-12 01:30:53 +0200 |
| commit | 55d3fd0c7ead5c47a3fbf63463b70af328e7dcc9 (patch) | |
| tree | 994c689c3aa3e6ab62ec4bfac1ddf5aabb5f9d7d /client/game.gd | |
| parent | 177056420c5f31a0fb41e9ce0a67fc90cad4312e (diff) | |
| parent | 0f0c7713218dc9fc8beafdbe14785c11a0f61ea8 (diff) | |
| download | hurrycurry-55d3fd0c7ead5c47a3fbf63463b70af328e7dcc9.tar hurrycurry-55d3fd0c7ead5c47a3fbf63463b70af328e7dcc9.tar.bz2 hurrycurry-55d3fd0c7ead5c47a3fbf63463b70af328e7dcc9.tar.zst | |
Merge branch 'master' of https://codeberg.org/hurrycurry/hurrycurry
Diffstat (limited to 'client/game.gd')
| -rw-r--r-- | client/game.gd | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/client/game.gd b/client/game.gd index acbe7286..aedfd5f7 100644 --- a/client/game.gd +++ b/client/game.gd @@ -46,7 +46,7 @@ var players := {} @onready var debug_label = $Debug @onready var overlay = $Overlay @onready var lobby = $"../Lobby" -@onready var server_message: ServerMessage = $ServerMessage +@onready var popup_message: PopupMessage = $PopupMessage func _ready(): if !Global.on_vulkan(): @@ -222,6 +222,11 @@ func _ready(): map.gi_bake() await get_parent().menu_anim_open() map.autobake = true + + if in_lobby_: + popup_message.stop_game_hints() + else: + popup_message.start_game_hints() else: map.autobake = false await get_parent().menu_anim_exit() @@ -230,7 +235,7 @@ func _ready(): mp.server_message.connect( func(text): print(text) - server_message.display_popup(text) + popup_message.display_server_msg(text) ) mp.score.connect(overlay.update) @@ -243,7 +248,7 @@ func _ready(): func join(): join_sent = true - mp.send_join(Global.profile["username"], Global.profile["character"]) + mp.send_join(Global.get_profile("username"), Global.get_profile("character")) func _process(delta): update_center() |