diff options
Diffstat (limited to 'client/player')
| -rw-r--r-- | client/player/controllable_player.gd | 2 | ||||
| -rw-r--r-- | client/player/marker/marker.tscn | 1 | ||||
| -rw-r--r-- | client/player/player.gd | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/client/player/controllable_player.gd b/client/player/controllable_player.gd index 8f5ce3c0..1b00aa8e 100644 --- a/client/player/controllable_player.gd +++ b/client/player/controllable_player.gd @@ -24,6 +24,7 @@ const BOOST_RESTORE = 0.5 const MAX_PLAYER_INTERACT_DIST := 1.9 var onscreen_controls = preload("res://player/onscreen_controls/controls.tscn").instantiate() +var marker: Marker = preload("res://player/marker/marker.tscn").instantiate() var facing := Vector2(1, 0) var velocity_ := Vector2(0, 0) @@ -57,6 +58,7 @@ func _ready(): game.mp.send_movement(game.my_player_id, position_, direction, boosting) ) add_child(onscreen_controls) + add_child(marker) Settings.hook_changed_init("gameplay.first_person", "hide_head", func(fps): character.head_default.visible = not fps character.username_tag.visible = not fps diff --git a/client/player/marker/marker.tscn b/client/player/marker/marker.tscn index 8ff8a2a6..755b6053 100644 --- a/client/player/marker/marker.tscn +++ b/client/player/marker/marker.tscn @@ -44,6 +44,7 @@ shader_parameter/pulse_speed = 4.0 shader_parameter/interacting = false [node name="Marker" type="Node3D"] +visible = false script = ExtResource("1_3njdu") [node name="Cube" type="MeshInstance3D" parent="."] diff --git a/client/player/player.gd b/client/player/player.gd index 624400db..c5ee0d89 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -39,7 +39,6 @@ var character: Character = preload("res://player/character/character.tscn").inst var chat_bubble: ChatBubble = null var item_bubble: ItemBubble = null var effect: Effect = null -var marker: Marker = preload("res://player/marker/marker.tscn").instantiate() var clear_chat_timer: Timer = Timer.new() var clear_item_timer: Timer = Timer.new() @@ -99,9 +98,6 @@ func _init(_id: int, name_: String, pos: Vector2, character_style_: Dictionary, add_child(clear_chat_timer) add_child(clear_item_timer) add_child(clear_effect_timer) - - marker.visible = false - add_child(marker) is_customer = player_class == "customer" is_chef = player_class == "chef" |