diff options
author | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
---|---|---|
committer | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
commit | 9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e (patch) | |
tree | f173294ca3cb88a26a9cc1a3d6ccd0884cf49824 /client/player | |
parent | 3e483fbbc2c7aa5cce7f31adc31d2cba15f9c08a (diff) | |
parent | dbb52c813e64fbe4e733dbfec4e29889d288873e (diff) | |
download | hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.bz2 hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.zst |
Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/player')
-rw-r--r-- | client/player/controllable_player.gd | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 65fcf960..a85d6c84 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -32,7 +32,7 @@ func _ready(): add_child(timer) timer.start() timer.connect("timeout", func(): - Multiplayer.send_position(position_, rotation_) + game.mp.send_position(position_, rotation_) ) func _process(delta): @@ -66,7 +66,7 @@ func collide(dt: float): for xo in range(-1,2): for yo in range(-1,2): var tile = Vector2i(xo, yo) + Vector2i(self.position_); - if !Multiplayer.get_tile_collision(tile): continue + if !game.mp.get_tile_collision(tile): continue tile = Vector2(tile) var d = aabb_point_distance(tile, tile + Vector2.ONE, self.position_); if d > PLAYER_SIZE: continue @@ -99,13 +99,13 @@ func interact(): var tile_idx = str(target) var t: Floor = game.map.tile_by_pos.get(tile_idx) if t != null: - game.marker.set_interactive(Multiplayer.get_tile_interactive(target)) + game.marker.set_interactive(game.mp.get_tile_interactive(target)) game.marker.visible = true game.marker_target = t.item_base.global_position if Input.is_action_just_pressed("interact"): - Multiplayer.send_interact(target, true) + game.mp.send_interact(target, true) t.interact() elif Input.is_action_just_released("interact"): - Multiplayer.send_interact(target, false) + game.mp.send_interact(target, false) else: game.marker.visible = false |