From fda3390aa1879fad3743f0fa2e612c7241dcf6fc Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 17 Mar 2023 14:27:31 +0100 Subject: [PATCH] avm2: Convert event to use ParametersExt --- core/src/avm2/globals/flash/events/event.rs | 22 ++++----------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/core/src/avm2/globals/flash/events/event.rs b/core/src/avm2/globals/flash/events/event.rs index f08f98c6f..75a8028b3 100644 --- a/core/src/avm2/globals/flash/events/event.rs +++ b/core/src/avm2/globals/flash/events/event.rs @@ -6,6 +6,7 @@ use crate::avm2::value::Value; use crate::avm2::Error; pub use crate::avm2::object::event_allocator; +use crate::avm2::parameters::ParametersExt; pub fn init<'gc>( activation: &mut Activation<'_, 'gc>, @@ -14,24 +15,9 @@ pub fn init<'gc>( ) -> Result, Error<'gc>> { let this = this.unwrap(); let mut evt = this.as_event_mut(activation.context.gc_context).unwrap(); - evt.set_event_type( - args.get(0) - .cloned() - .unwrap_or(Value::Undefined) - .coerce_to_string(activation)?, - ); - evt.set_bubbles( - args.get(1) - .cloned() - .unwrap_or(Value::Bool(false)) - .coerce_to_boolean(), - ); - evt.set_cancelable( - args.get(2) - .cloned() - .unwrap_or(Value::Bool(false)) - .coerce_to_boolean(), - ); + evt.set_event_type(args.get_string(activation, 0)?); + evt.set_bubbles(args.get_bool(1)); + evt.set_cancelable(args.get_bool(2)); Ok(Value::Undefined) }