Merge branch 'master' of https://codeberg.org/metamuffin/undercooked

1 files changed, 7 insertions, 4 deletions

diff --git a/client/multiplayer.gd b/client/multiplayer.gd
index af80fc0f..a1e865f2 100644
--- a/client/multiplayer.gd
+++ b/client/multiplayer.gd
@@ -23,7 +23,8 @@ signal data(
 	item_names: Array,
 	tile_names: Array,
 	tile_collide: Array,
-	tile_interact: Array
+	tile_interact: Array,
+	map_names: Array
 )
 signal set_tile(tile: Vector2i, kind: int, neighbors: Array)
 signal remove_tile(tile: Vector2i)
@@ -46,7 +47,7 @@ signal set_tile_progress(tile: Vector2i, progress: float, warn: bool)
 signal set_player_progress(player: int, progress: float, warn: bool)
 signal set_tile_finished(tile: Vector2i, warn: bool)
 signal set_player_finished(player: int, warn: bool)
-signal set_ingame(state: bool)
+signal set_ingame(state: bool, lobby: bool)
 signal score(demands_failed: int, demands_completed: int, points: int, time_remaining: float)
 signal hide_score()
 signal server_message(text: String)
@@ -98,7 +99,8 @@ func handle_packet(bytes: PackedByteArray):
 			var tile_names = decoded["data"]["tile_names"]
 			var tile_collide = decoded["data"]["tile_collide"]
 			var tile_interact = decoded["data"]["tile_interact"]
-			data.emit(item_names, tile_names, tile_collide, tile_interact)
+			var map_names = decoded["data"]["map_names"]
+			data.emit(item_names, tile_names, tile_collide, tile_interact, map_names)
 		"add_player":
 			var id = decoded["id"]
 			var player_name = decoded["name"]
@@ -223,7 +225,8 @@ func handle_packet(bytes: PackedByteArray):
 				clear_message.emit(player)
 		"set_ingame":
 			var state = decoded["state"]
-			set_ingame.emit(state)
+			var lobby = decoded["lobby"]
+			set_ingame.emit(state, lobby)
 		"error":
 			var message = decoded["message"]
 			push_warning("server error: %s" % message)