aboutsummaryrefslogtreecommitdiff
path: root/client/game.gd
diff options
context:
space:
mode:
Diffstat (limited to 'client/game.gd')
-rw-r--r--client/game.gd10
1 files changed, 8 insertions, 2 deletions
diff --git a/client/game.gd b/client/game.gd
index 55bc9dac..27a5715b 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -138,12 +138,18 @@ func _ready():
p.put_item(t)
)
- mp.pass_item.connect(func(from: int, to: int):
+ mp.pass_item_player.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.pass_item_tile.connect(func(from: Vector2i, to: Vector2i):
+ var from_tile: Tile = map.get_tile_instance(from)
+ var to_tile: Tile = map.get_tile_instance(to)
+ from_tile.pass_to(to_tile)
+ )
+
mp.set_tile_progress.connect(func(tile: Vector2i, progress: float, warn: bool):
var t: Tile = map.get_tile_instance(tile)
t.progress(progress, warn)
@@ -204,7 +210,7 @@ func _ready():
func _process(delta):
marker.position = Global.interpolate(marker.position, marker_target, delta * 30.)
-
+
if Global.get_setting("debug_info"):
debug_label.show()
debug_label.text = "%d FPS" % Engine.get_frames_per_second()