liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm1: Grab correct variables for `MovieClip.loadVariables` and `loadMovie` 

The request was being populated with parameters from the local
function scope, not the movieclip that is doing the loading.
This commit is contained in:
Mike Welsh 2023-04-04 21:10:47 -07:00
parent 93a0fd43d6
commit 3716422b37
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/avm1/globals/movie_clip.rs
View File

@ -1332,7 +1332,8 @@ fn load_movie<'gc>(
let url = url_val.coerce_to_string(activation)?;
let method = args.get(1).cloned().unwrap_or(Value::Undefined);
let method = NavigationMethod::from_method_str(&method.coerce_to_string(activation)?);
let request = activation.locals_into_request(url, method);
let target_obj = target.object().coerce_to_object(activation);
let request = activation.object_into_request(target_obj, url, method);
let future = activation.context.load_manager.load_movie_into_clip(
activation.context.player.clone(),
DisplayObject::MovieClip(target),
@ -1355,8 +1356,8 @@ fn load_variables<'gc>(
let url = url_val.coerce_to_string(activation)?;
let method = args.get(1).cloned().unwrap_or(Value::Undefined);
let method = NavigationMethod::from_method_str(&method.coerce_to_string(activation)?);
let request = activation.locals_into_request(url, method);
let target = target.object().coerce_to_object(activation);
let request = activation.object_into_request(target, url, method);
let future = activation.context.load_manager.load_form_into_object(
activation.context.player.clone(),
target,