From fc32dc36719428f8e0fae9a1b7b21bff0bf949fe Mon Sep 17 00:00:00 2001 From: michiel2005 <60014996+michiel2005@users.noreply.github.com> Date: Fri, 14 Jul 2023 22:55:45 +0200 Subject: [PATCH] Removed some code that was double checking without any need. --- core/src/player.rs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/core/src/player.rs b/core/src/player.rs index bdafae573..48a297436 100644 --- a/core/src/player.rs +++ b/core/src/player.rs @@ -1272,11 +1272,11 @@ impl Player { } } } + if let Some(pressed) = context.mouse_down_object { if !context.is_action_script_3() && pressed.as_displayobject().avm1_removed() { context.mouse_down_object = None; let mut display_object = None; - if let Some(root_clip) = context.stage.root_clip() { display_object = Self::find_first_character_instance( root_clip, @@ -1285,21 +1285,11 @@ impl Player { } if let Some(new_down_object) = display_object { - if new_down_object.depth() == pressed.as_displayobject().depth() - && Arc::ptr_eq( - &new_down_object.movie(), - &pressed.as_displayobject().movie(), - ) - { - if let Some(state) = pressed.as_displayobject().state() { - new_down_object.set_state(context, state); - } - context.mouse_down_object = if display_object.is_some() { - new_down_object.as_interactive() - } else { - None - }; + if let Some(state) = pressed.as_displayobject().state() { + new_down_object.set_state(context, state); } + + context.mouse_down_object = new_down_object.as_interactive(); } } }