summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/game.gd4
-rw-r--r--client/player/onscreen_controls/controls.gd4
2 files changed, 7 insertions, 1 deletions
diff --git a/client/game.gd b/client/game.gd
index 52beca7b..ef40c083 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -20,6 +20,7 @@ extends Node3D
signal update_players(players: Dictionary)
signal data_updated()
+signal in_lobby_updated(in_lobby: bool)
signal joined()
signal left()
@@ -98,6 +99,8 @@ func _ready():
var player_instance: Player
if player == player_id:
player_instance = ControllablePlayer.new(player, player_name, pos, character, self)
+ in_lobby_updated.connect(player_instance.onscreen_controls.in_lobby_updated)
+ player_instance.onscreen_controls.in_lobby_updated(in_lobby)
camera.target = player_instance.movement_base
is_joined = true
join_sent = true
@@ -236,6 +239,7 @@ func _ready():
mp.set_ingame.connect(func (state, in_lobby_):
in_lobby = in_lobby_
+ in_lobby_updated.emit(in_lobby)
if state:
map.gi_bake()
await get_parent()._menu_open()
diff --git a/client/player/onscreen_controls/controls.gd b/client/player/onscreen_controls/controls.gd
index 9f8d273b..0d240ddb 100644
--- a/client/player/onscreen_controls/controls.gd
+++ b/client/player/onscreen_controls/controls.gd
@@ -15,7 +15,6 @@
#
extends CanvasLayer
-@onready var buttons = $Buttons
@onready var boost = $Buttons/Boost
@onready var interact = $Buttons/Interact
@onready var pause = $Buttons2/Pause
@@ -31,6 +30,9 @@ func apply_touch(touch):
visible = touch
touch_enabled = touch
+func in_lobby_updated(in_lobby: bool):
+ $Buttons.visible = not in_lobby
+
func _on_boost_pressed():
Input.action_press("boost")
boost.modulate = modulate_color