George 6.0.0 #3079
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,6 +129,16 @@ class FlxFlicker implements IFlxDestroyable | |
| progressCallback = null; | ||
| } | ||
|
|
||
| public function pause():Void { | ||
| if (timer == null) return; | ||
| timer.active = false; | ||
| } | ||
|
|
||
| public function resume():Void { | ||
| if (timer == null) return; | ||
| timer.active = true; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. pretty simple change, why not, same for preventing double release, below |
||
| /** | ||
| * Starts flickering behavior. | ||
| */ | ||
|
|
@@ -182,7 +192,12 @@ class FlxFlicker implements IFlxDestroyable | |
| { | ||
| completionCallback(this); | ||
| } | ||
|
|
||
| // NOTE: Calling `flicker` in the completion callback will call release() on this object before reinstantiating it. | ||
| // If that happens, we don't want to call release() again! So we check if the flicker is still done before releasing. | ||
| if (this.timer == Timer) { | ||
| release(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -499,7 +499,8 @@ class FlxGraphic implements IFlxDestroyable | |
| if (collection.type != null) | ||
| { | ||
| var collections:Array<Dynamic> = getFramesCollections(collection.type); | ||
| if (collections.indexOf(collection) == -1) | ||
|
There was a problem hiding this comment. Should I add this to flixel? what does it improve? There was a problem hiding this comment. I want to say I made this change back when I was working on trying to resolve an issue with FlxAnimate. I'd definitely keep it as you don't want the list of collections to have duplicate references in it (as that can cause the reference counts to get messed up). |
||
| collections.push(collection); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -511,6 +512,8 @@ class FlxGraphic implements IFlxDestroyable | |
| */ | ||
| public inline function getFramesCollections(type:FlxFrameCollectionType):Array<Dynamic> | ||
| { | ||
| if (isDestroyed) return []; | ||
|
There was a problem hiding this comment. same question, should this have been added in #2974 |
||
|
|
||
| var collections:Array<Dynamic> = frameCollections.get(type); | ||
| if (collections == null) | ||
| { | ||
|
|
||
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this triggering for you? My hope with #2974 was to prevent these issues
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in discord: