From dbb52c813e64fbe4e733dbfec4e29889d288873e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 24 Jun 2024 19:28:54 +0200 Subject: make multiplayer non global --- client/player/controllable_player.gd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'client/player/controllable_player.gd') 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 -- cgit v1.2.3-70-g09d2