From ad84c2bbcb98bc9d9801de8e49d59287ed70c4e4 Mon Sep 17 00:00:00 2001 From: relrelb Date: Fri, 26 Aug 2022 15:38:06 +0300 Subject: [PATCH] avm2: Rename `Avm2::load_abc` to `Avm2::do_abc` This aligns with the name of `DoAbc` tags. --- core/src/avm2.rs | 2 +- core/src/avm2/globals.rs | 2 +- core/src/display_object/movie_clip.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/avm2.rs b/core/src/avm2.rs index dbaddbea7..b207a570d 100644 --- a/core/src/avm2.rs +++ b/core/src/avm2.rs @@ -261,7 +261,7 @@ impl<'gc> Avm2<'gc> { } /// Load an ABC file embedded in a `DoAbc` tag. - pub fn load_abc( + pub fn do_abc( context: &mut UpdateContext<'_, 'gc, '_>, do_abc: DoAbc, domain: Domain<'gc>, diff --git a/core/src/avm2/globals.rs b/core/src/avm2/globals.rs index 5206dfd65..c5a227b35 100644 --- a/core/src/avm2/globals.rs +++ b/core/src/avm2/globals.rs @@ -681,7 +681,7 @@ fn load_playerglobal<'gc>( let do_abc = reader .read_do_abc() .expect("playerglobal.swf should be valid"); - Avm2::load_abc(&mut activation.context, do_abc, domain) + Avm2::do_abc(&mut activation.context, do_abc, domain) .expect("playerglobal.swf should be valid"); } else if tag_code != TagCode::End { panic!( diff --git a/core/src/display_object/movie_clip.rs b/core/src/display_object/movie_clip.rs index 32849faf0..2bd8f37d0 100644 --- a/core/src/display_object/movie_clip.rs +++ b/core/src/display_object/movie_clip.rs @@ -579,7 +579,7 @@ impl<'gc> MovieClip<'gc> { let movie = self.movie().unwrap(); let domain = context.library.library_for_movie_mut(movie).avm2_domain(); - if let Err(e) = Avm2::load_abc(context, do_abc, domain) { + if let Err(e) = Avm2::do_abc(context, do_abc, domain) { log::warn!("Error loading ABC file: {}", e); } }