refactor menu system yet again

1 files changed, 3 insertions, 6 deletions

diff --git a/client/game.gd b/client/game.gd
index 79db16ea..fcab85dd 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -22,7 +22,6 @@ extends Node3D
 @onready var map: Map = $Map
 @onready var marker: Marker = $Marker
 @onready var environment = $WorldEnvironment
-@onready var transition: SceneTransition = $SceneTransition
 
 var player_id: int = -1
 var item_names: Array = []
@@ -43,7 +42,7 @@ func _ready():
 
 	mp.connection_closed.connect(func(reason: String):
 		Global.error_message = reason;
-		$SceneTransition.instant_to("res://menu/error_menu.tscn")
+		get_parent().replace_menu("res://menu/error_menu.tscn")
 	)
 
 	mp.init.connect(func(player_id_: int): player_id = player_id_)
@@ -175,13 +174,12 @@ func _ready():
 
 	mp.set_ingame.connect(func (state):
 		if state:
-			await transition.fade_out()
 			map.gi_bake()
-			await transition.fade_in()
+			await get_parent().menu_anim_open()
 			map.autobake = true
 		else:
 			map.autobake = false
-			await transition.fade_out()
+			await get_parent().menu_anim_exit()
 	)
 
 	mp.score.connect($Overlay.update)
@@ -202,4 +200,3 @@ func get_tile_interactive(pos: Vector2i) -> bool:
 func set_tile(tile: Vector2i, kind = null, neighbors = null):
 	if neighbors != null: neighbors = neighbors.map(func (x): return tile_names[x] if x != null else null)
 	map.set_tile(tile, tile_names[kind], neighbors)
-