Fix: Move menus from game.tscn to menu/game.tscn to prevent wrong 2D order

4 files changed, 31 insertions, 2 deletions

diff --git a/client/menu/game.gd b/client/menu/game.gd
index 362bf169..78c01c42 100644
--- a/client/menu/game.gd
+++ b/client/menu/game.gd
@@ -16,6 +16,10 @@
 #
 extends Menu
 
+@onready var debug_label = $Debug
+@onready var overlay = $Overlay
+@onready var popup_message: PopupMessage = $PopupMessage
+
 func _ready():
 	get_tree().get_root().connect("go_back_requested", open_ingame_menu)
 	super()
@@ -24,6 +28,12 @@ func _input(_event):
 	if Input.is_action_just_pressed("ui_menu"):
 		open_ingame_menu()
 
+func _process(delta):
+	if Global.get_setting("debug_info"):
+		debug_label.show()
+		debug_label.text = "%d FPS" % Engine.get_frames_per_second()
+	else: debug_label.hide()
+
 func open_ingame_menu():
 	if popup != null: return
 	Sound.play_click()
diff --git a/client/menu/game.tscn b/client/menu/game.tscn
index af7f22a8..417aaf96 100644
--- a/client/menu/game.tscn
+++ b/client/menu/game.tscn
@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://bbjwoxs71fnsk"]
+[gd_scene load_steps=6 format=3 uid="uid://bbjwoxs71fnsk"]
 
 [ext_resource type="Script" path="res://menu/game.gd" id="1_cdpsh"]
 [ext_resource type="PackedScene" uid="uid://c6krh36hoqfg8" path="res://game.tscn" id="2_uojcy"]
+[ext_resource type="PackedScene" uid="uid://bpikve6wlsjfl" path="res://menu/overlay.tscn" id="3_i0ytb"]
 [ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://menu/lobby.tscn" id="3_udxby"]
+[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/popup_message.tscn" id="5_n1wy0"]
 
 [node name="GameMenu" type="Control"]
 layout_mode = 3
@@ -16,5 +18,21 @@ auto_anim = false
 
 [node name="Game" parent="." instance=ExtResource("2_uojcy")]
 
+[node name="Overlay" parent="." instance=ExtResource("3_i0ytb")]
+layout_mode = 1
+
 [node name="Lobby" parent="." instance=ExtResource("3_udxby")]
 layout_mode = 1
+
+[node name="Debug" type="RichTextLabel" parent="."]
+visible = false
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 1
+
+[node name="PopupMessage" parent="." instance=ExtResource("5_n1wy0")]
+layout_mode = 1
diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd
index ae7548b7..3c4a6f58 100644
--- a/client/menu/lobby.gd
+++ b/client/menu/lobby.gd
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 extends Control
+class_name Lobby
 
 const PLAYER = preload("res://menu/lobby/player.tscn")
 
diff --git a/client/menu/popup_message.gd b/client/menu/popup_message.gd
index 1748f59a..480a7591 100644
--- a/client/menu/popup_message.gd
+++ b/client/menu/popup_message.gd
@@ -32,7 +32,7 @@ var is_joined := false
 
 @onready var reset_timer = $Reset
 
-@onready var game: Game = get_parent()
+@onready var game: Game = $"../Game"
 
 func _ready():
 	game.joined.connect(