avm1: Correct MovieClipLoader methods
#6004
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Herschel
reviewed
Jan 10, 2022
Comment on lines
+47
to
+59
| let target = match target { | ||
| Value::String(_) => { | ||
| let start_clip = activation.target_clip_or_root()?; | ||
| activation.resolve_target_display_object(start_clip, *target, true)? | ||
| } | ||
| Value::Number(level_id) => { | ||
| // Levels are rounded down. | ||
| // TODO: What happens with negative levels? | ||
| Some(activation.resolve_level(*level_id as i32)) | ||
| } | ||
| Value::Object(object) => object.as_display_object(), | ||
| _ => None, | ||
| }; |
There was a problem hiding this comment.
Maybe extract this logic into a fn since it's used by several of the methods?
There was a problem hiding this comment.
Unfortunately, they have subtle differences:
load_clipusesresolve_level.unload_clipandget_progressusechild_by_depthget_progressreturnsundefinedfor non-DisplayObject objects.
It might be possible, but I doubt how better it will be.
Handle strings, numbers and DisplayObject targets (not just MovieClips). To support non-MovieClip targets, turn `clip.as_movie_clip().unwrap()` to `if let Some(mc) = clip.as_movie_clip()` in `Loader`.
Handle strings, numbers and DisplayObject targets.
Handle strings, numbers and DisplayObject targets. Return compressed length rather than uncompressed length.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #917.