core: Revert "core: Remove Option from queued_script_frame"

Author: nivkner

core/src/display_object/movie_clip.rs

@@ -175,7 +175,7 @@ pub struct MovieClipData<'gc> {
     /// trigger on this clip rather than any input-eligible children.
     button_mode: Cell<bool>,
     last_queued_script_frame: Option<FrameNumber>,
-    queued_script_frame: FrameNumber,
+    queued_script_frame: Option<FrameNumber>,
     queued_goto_frame: Option<FrameNumber>,
     drop_target: Option<DisplayObject<'gc>>,
 
@@ -220,7 +220,7 @@ impl<'gc> MovieClip<'gc> {
                 avm2_use_hand_cursor: Cell::new(true),
                 button_mode: Cell::new(false),
                 last_queued_script_frame: None,
-                queued_script_frame: 0,
+                queued_script_frame: None,
                 queued_goto_frame: None,
                 drop_target: None,
                 hit_area: None,
@@ -263,7 +263,7 @@ impl<'gc> MovieClip<'gc> {
                 avm2_use_hand_cursor: Cell::new(true),
                 button_mode: Cell::new(false),
                 last_queued_script_frame: None,
-                queued_script_frame: 0,
+                queued_script_frame: None,
                 queued_goto_frame: None,
                 drop_target: None,
                 hit_area: None,
@@ -309,7 +309,7 @@ impl<'gc> MovieClip<'gc> {
                 avm2_use_hand_cursor: Cell::new(true),
                 button_mode: Cell::new(false),
                 last_queued_script_frame: None,
-                queued_script_frame: 0,
+                queued_script_frame: None,
                 queued_goto_frame: None,
                 drop_target: None,
                 hit_area: None,
@@ -365,7 +365,7 @@ impl<'gc> MovieClip<'gc> {
                 avm2_use_hand_cursor: Cell::new(true),
                 button_mode: Cell::new(false),
                 last_queued_script_frame: None,
-                queued_script_frame: 0,
+                queued_script_frame: None,
                 queued_goto_frame: None,
                 drop_target: None,
                 hit_area: None,
@@ -432,7 +432,7 @@ impl<'gc> MovieClip<'gc> {
                 avm2_use_hand_cursor: Cell::new(true),
                 button_mode: Cell::new(false),
                 last_queued_script_frame: None,
-                queued_script_frame: 0,
+                queued_script_frame: None,
                 queued_goto_frame: None,
                 drop_target: None,
                 hit_area: None,
@@ -1571,7 +1571,7 @@ impl<'gc> MovieClip<'gc> {
             write.current_frame += 1;
         }
 
-        write.queued_script_frame = write.current_frame;
+        write.queued_script_frame = Some(write.current_frame);
         if write.last_queued_script_frame != Some(write.current_frame) {
             // We explicitly clear this variable since AS3 may later GOTO back
             // to the already-ran frame. Since the frame number *has* changed
@@ -2631,16 +2631,16 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
         let avm2_object = write.object.and_then(|o| o.as_avm2_object());
 
         if let Some(avm2_object) = avm2_object {
-            let frame_id = write.queued_script_frame;
-            {
+            if let Some(frame_id) = write.queued_script_frame {
                 // If we are already executing frame scripts, then we shouldn't
                 // run frame scripts recursively. This is because AVM2 can run
                 // gotos, which will both queue and run frame scripts for the
                 // whole movie again. If a goto is attempting to queue frame
                 // scripts on us AGAIN, we should allow the current stack to
                 // wind down before handling that.
                 if !write.contains_flag(MovieClipFlags::EXECUTING_AVM2_FRAME_SCRIPT) {
-                    let is_fresh_frame = write.last_queued_script_frame != Some(frame_id);
+                    let is_fresh_frame =
+                        write.queued_script_frame != write.last_queued_script_frame;
 
                     if is_fresh_frame {
                         if let Some(Some(callable)) =