Compare commits

..

No commits in common. "03421264fd7fbc9710e245e192c0608861bfb356" and "ad773f68eb845c16663f258abb76c92f757d5b25" have entirely different histories.

2 changed files with 11 additions and 11 deletions

View File

@ -55,16 +55,16 @@ func _process(_delta: float) -> void:
func _physics_process(delta: float) -> void: func _physics_process(delta: float) -> void:
## Process interactivity selection. ## Process interactivity selection.
if id == multiplayer.get_unique_id(): var collider: Object = null
var collider: Object = null if _line_of_sight.is_colliding():
if _line_of_sight.is_colliding(): collider = _line_of_sight.get_collider(0)
collider = _line_of_sight.get_collider(0) if collider != _interaction_selection:
if collider != _interaction_selection: if _interaction_selection != null:
if _interaction_selection != null: _interaction_selection.get_parent().mark_non_interactive()
_interaction_selection.get_parent().mark_non_interactive() if collider != null:
if collider != null: collider.get_parent().mark_interactive()
collider.get_parent().mark_interactive() _interaction_selection = collider
_interaction_selection = collider
# Add the gravity. # Add the gravity.
if not is_on_floor(): if not is_on_floor():

View File

@ -52,7 +52,7 @@ func _on_body_entered(p_body: Node3D) -> void:
_model.hide() _model.hide()
_picking_area.collision_layer = 0 _picking_area.collision_layer = 0
_disable_body.rpc() _disable_body.rpc()
_picking_area.collision_layer = 0
await _splash_small_sound.finished await _splash_small_sound.finished
if _splash_small_quiet_sound.playing: if _splash_small_quiet_sound.playing:
await _splash_small_quiet_sound.finished await _splash_small_quiet_sound.finished