Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Common - Use lifeState check in FUNC(isAwake) #9646

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Conversation

LinkIsGrim
Copy link
Contributor

When merged this pull request will:

  • Title.

This is more reliable for non-ACE medical systems.

@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Nov 11, 2023
@johnb432
Copy link
Contributor

I'm in favour of this, but I don't know what secondary effects this could have.

@johnb432
Copy link
Contributor

johnb432 commented Apr 1, 2024

I'm in favour of this, but I don't know what secondary effects this could have.

#9539 (comment)

@LinkIsGrim
Copy link
Contributor Author

I'm in favour of this, but I don't know what secondary effects this could have.

#9539 (comment)

Not the same check that's being done in this PR.

@johnb432
Copy link
Contributor

johnb432 commented Apr 1, 2024

Not the same check that's being done in this PR.

I used to check consciousness with the current version of FUNC(isAwake) in that PR, now I've changed it to use lifeState because it wasn't reliable.
Imo it's a positive secondary effect, even a fix, if we use lifeState, but it's a change nonetheless, which I wanted to point out.

Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"ACE_isUnconscious" is changed

_unit setVariable [VAR_UNCON, _active, true];
just before setUnconscious is
_unit setUnconscious _isUnconscious;

If _unit is not local, ace_medical_engine_fnc_setUnconsciousAnim wouldn't run and the values would be desynced, but in that case I think we have bigger issues.

@johnb432 johnb432 added this to the 3.18.0 milestone Aug 13, 2024
@LinkIsGrim LinkIsGrim merged commit fcfb212 into master Aug 17, 2024
5 checks passed
@LinkIsGrim LinkIsGrim deleted the isAwake-lifeState branch August 17, 2024 15:59
blake8090 pushed a commit to blake8090/ACE3 that referenced this pull request Aug 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants