diff --git a/core/src/avm1.rs b/core/src/avm1.rs index 93474aa5e..837f45d04 100644 --- a/core/src/avm1.rs +++ b/core/src/avm1.rs @@ -30,10 +30,8 @@ pub use function::ExecutionReason; pub use globals::context_menu::make_context_menu_state; pub use globals::shared_object::flush; pub use globals::system::SystemProperties; -pub use globals::SystemPrototypes; pub use object::array_object::ArrayObject; pub use object::script_object::ScriptObject; -pub use object::shared_object::SharedObject; pub use object::sound_object::SoundObject; pub use object::stage_object::StageObject; pub use object::xml_node_object::XmlNodeObject; diff --git a/core/src/avm1/runtime.rs b/core/src/avm1/runtime.rs index 93da11c8f..8890dc844 100644 --- a/core/src/avm1/runtime.rs +++ b/core/src/avm1/runtime.rs @@ -30,7 +30,7 @@ pub struct Avm1<'gc> { globals: Object<'gc>, /// System built-ins that we use internally to construct new objects. - prototypes: avm1::SystemPrototypes<'gc>, + prototypes: avm1::globals::SystemPrototypes<'gc>, /// Cached functions for the AsBroadcaster broadcaster_functions: BroadcasterFunctions<'gc>, @@ -347,7 +347,7 @@ impl<'gc> Avm1<'gc> { } /// Obtain system built-in prototypes for this instance. - pub fn prototypes(&self) -> &avm1::SystemPrototypes<'gc> { + pub fn prototypes(&self) -> &avm1::globals::SystemPrototypes<'gc> { &self.prototypes }