diff options
Diffstat (limited to 'client/player/controllable_player.gd')
-rw-r--r-- | client/player/controllable_player.gd | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 17f6693f..93b05e9a 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -59,6 +59,7 @@ func _input(_event): const MAX_DT = 1./50. func _process(delta): + marker.position = Global.interpolate(marker.position, marker_target, delta * 30.) while delta > 0.001: var dt = min(delta, MAX_DT) _process_movement(dt) @@ -73,8 +74,8 @@ func _process_movement(delta): input *= 0 else: target = Vector2i( - int(floor(position.x + sin(rotation.y))), - int(floor(position.z + cos(rotation.y))) + int(floor(movement_base.position.x + sin(movement_base.rotation.y))), + int(floor(movement_base.position.z + cos(movement_base.rotation.y))) ) interact() var was_boosting = boosting @@ -153,16 +154,16 @@ func interact(): return var tile = game.map.get_tile_instance(target) if tile != null: - game.marker.set_interactive(game.get_tile_interactive(target)) - game.marker.visible = true - game.marker_target = tile.item_base.global_position + marker.set_interactive(game.get_tile_interactive(target)) + marker.visible = true + marker_target = tile.item_base.global_position if Input.is_action_just_pressed("interact"): game.mp.send_tile_interact(target, true) tile.interact() elif Input.is_action_just_released("interact"): game.mp.send_tile_interact(target, false) else: - game.marker.visible = false + marker.visible = false func set_input_enabled(b: bool): enable_input = b |