core: Random SWF-related cleanups

ruffle-rs · Oct 8, 2021 · 54df49f · 54df49f
1 parent d069b8d
commit 54df49f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/src/avm1/function.rs b/core/src/avm1/function.rs
@@ -54,6 +54,7 @@ pub struct Avm1Function<'gc> {
 
     /// A reference to the underlying SWF data.
     data: SwfSlice,
+
     /// The name of the function, if not anonymous.
     name: Option<AvmString<'gc>>,
 

diff --git a/core/src/display_object/avm1_button.rs b/core/src/display_object/avm1_button.rs
@@ -232,7 +232,7 @@ impl<'gc> TDisplayObject<'gc> for Avm1Button<'gc> {
     }
 
     fn movie(&self) -> Option<Arc<SwfMovie>> {
-        Some(self.0.read().static_data.read().swf.clone())
+        Some(self.0.read().movie())
     }
 
     fn post_instantiation(
@@ -285,7 +285,7 @@ impl<'gc> TDisplayObject<'gc> for Avm1Button<'gc> {
                 if record.states.contains(swf::ButtonState::HIT_TEST) {
                     match context
                         .library
-                        .library_for_movie_mut(read.static_data.read().swf.clone())
+                        .library_for_movie_mut(read.movie())
                         .instantiate_by_id(record.id, context.gc_context)
                     {
                         Ok(child) => {
@@ -594,7 +594,7 @@ impl From<ButtonState> for swf::ButtonState {
 
 #[derive(Clone, Debug)]
 struct ButtonAction {
-    action_data: crate::tag_utils::SwfSlice,
+    action_data: SwfSlice,
     condition: swf::ButtonActionCondition,
     key_code: Option<ButtonKeyCode>,
 }

diff --git a/core/src/tag_utils.rs b/core/src/tag_utils.rs
@@ -185,7 +185,7 @@ impl From<Arc<SwfMovie>> for SwfSlice {
 impl AsRef<[u8]> for SwfSlice {
     #[inline]
     fn as_ref(&self) -> &[u8] {
-        &self.movie.data()[self.start..self.end]
+        self.data()
     }
 }