Handle initPost EH added during PostInit #736
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
Dystopian
reviewed
Aug 18, 2017
| @@ -73,6 +73,8 @@ _entities = _entities arrayIntersect _entities; // entities can return duplicate | |||
|
|
|||
| //Run initReto now if the unit has already been initialized | |||
| if (_applyInitRetroactively && {ISINITIALIZED(_unit)}) then { | |||
| // If PostInit has not finisehd exit as it will be run via initPostStack | |||
Dystopian
reviewed
Aug 18, 2017
| @@ -73,6 +73,8 @@ _entities = _entities arrayIntersect _entities; // entities can return duplicate | |||
|
|
|||
| //Run initReto now if the unit has already been initialized | |||
| if (_applyInitRetroactively && {ISINITIALIZED(_unit)}) then { | |||
| // If PostInit has not finisehd exit as it will be run via initPostStack | |||
| if ((_eventName == "initpost") && {!(SLX_XEH_MACHINE select 8)}) exitWith {}; | |||
There was a problem hiding this comment.
this condition could be moved to parent if
There was a problem hiding this comment.
Looks ugly:
if (_applyInitRetroactively && {ISINITIALIZED(_unit) && {_eventName != "initPost" || {SLX_XEH_MACHINE select 8}}}) then {
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.
Should fix #567
Before:
PreInit Runs
Unit Init runs (unit gets initilized var set)
PostInit Starts
Adds InitPost EH to unit, which would run immediately (PROBLEM).
PostInit finishes by running through
GVAR(initPostStack)and run all initPost EHs