core: Fix regressions in avm1 buttons

Closes #18610.
ruffle-rs · Nov 17, 2024 · d1466ee · d1466ee
1 parent 114d24f
commit d1466ee
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/core/src/display_object/movie_clip.rs b/core/src/display_object/movie_clip.rs
@@ -2373,7 +2373,7 @@ impl<'gc> MovieClip<'gc> {
                 .intersects(ClipEvent::BUTTON_EVENT_FLAGS)
         {
             true
-        } else if self.is_root() {
+        } else if self.avm1_parent().is_none() {
             false
         } else {
             let object = self.object();

diff --git a/tests/tests/swfs/avm1/root_button_mode/input.json b/tests/tests/swfs/avm1/root_button_mode/input.json
@@ -1,4 +1,7 @@
 [
+    {
+        "type": "Wait"
+    },
     {
         "type": "Wait"
     },
@@ -60,9 +63,6 @@
         "pos": [150.0, 150.0],
         "btn": "Left"
     },
-    {
-        "type": "Wait"
-    },
     {
         "type": "Wait"
     }

diff --git a/tests/tests/swfs/avm1/root_button_mode/output.txt b/tests/tests/swfs/avm1/root_button_mode/output.txt
@@ -1,4 +1,10 @@
+_level0.mc2.onMouseDown
 _level0.onMouseDown
+_level0.mc2.onMouseUp
 _level0.onMouseUp
+_level0.mc2.onMouseDown
 _level0.onMouseDown
+_level0.mc2.onPress
+_level0.mc2.onMouseUp
 _level0.onMouseUp
+_level0.mc2.onRelease
diff --git a/tests/tests/swfs/avm1/root_button_mode/source.as b/tests/tests/swfs/avm1/root_button_mode/source.as
@@ -1,7 +1,7 @@
 // Test made with JPEXS Free Flash Decompiler.
 
-function createMC(name, x, y) {
-	var mc = _root.createEmptyMovieClip(name, _root.getNextHighestDepth());
+function createMC(name, x, y, parent) {
+	var mc = parent.createEmptyMovieClip(name, parent.getNextHighestDepth());
 	mc._x = x;
 	mc._y = y;
 	mc.beginFill(0xFF0000);
@@ -28,5 +28,14 @@ function setFunctions(mc) {
 	};
 }
 
-createMC("square", 0, 0);
-setFunctions(_root);
+if(this === _level0) {
+	createMC("square", 0, 0, this);
+	setFunctions(this);
+	// Issue #18610.
+	this.createEmptyMovieClip("mc2", this.getNextHighestDepth());
+	loadMovie("test.swf", "mc2");
+} else {
+	this._lockroot = true;
+	createMC("square", 100, 100, this);
+	setFunctions(this);
+}
diff --git a/tests/tests/swfs/avm1/root_button_mode/test.swf b/tests/tests/swfs/avm1/root_button_mode/test.swf