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

1 files changed, 19 insertions, 3 deletions

diff --git a/client/game.gd b/client/game.gd
index 51f593a7..3102c84d 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -133,22 +133,38 @@ func _ready():
 		p.take_item(t)
 	)
 
-	mp.put_item.connect(func(tile: Vector2i, player: int):
+	mp.put_item.connect(func(player: int, tile: Vector2i):
 		var t: Tile = map.get_tile_instance(tile)
 		var p: Player = players[player]
 		p.put_item(t)
 	)
 
-	mp.set_progress.connect(func(tile: Vector2i, progress: float, warn: bool):
+	mp.pass_item.connect(func(from: int, to: int):
+		var from_player: Player = players[from]
+		var to_player: Player = players[to]
+		from_player.pass_to(to_player)
+	)
+
+	mp.set_tile_progress.connect(func(tile: Vector2i, progress: float, warn: bool):
 		var t: Tile = map.get_tile_instance(tile)
 		t.progress(progress, warn)
 	)
 
-	mp.set_finished.connect(func(tile: Vector2i, warn: bool):
+	mp.set_tile_finished.connect(func(tile: Vector2i, warn: bool):
 		var t: Tile = map.get_tile_instance(tile)
 		t.finish(warn)
 	)
 
+	mp.set_player_progress.connect(func(player: int, progress: float, warn: bool):
+		var p: Player = players[player]
+		p.progress(progress, warn)
+	)
+
+	mp.set_player_finished.connect(func(player: int, warn: bool):
+		var p: Player = players[player]
+		p.finish(warn)
+	)
+
 	mp.text_message.connect(func(player: int, text: String, persist: bool):
 		var p: Player = players[player]
 		p.text_message(text, persist)