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

Prevent treatment animation on dead bodies #6524

Merged
merged 3 commits into from
Aug 12, 2018
Merged

Conversation

kymckay
Copy link
Member

@kymckay kymckay commented Aug 12, 2018

This was causing bodies to glitch out on dedicated servers according to feedback.

This was causing bodies to glitch out on dedicated servers according to
feedback
@kymckay kymckay added the kind/bug-fix Release Notes: **FIXED:** label Aug 12, 2018
@kymckay kymckay added this to the Medical Rewrite milestone Aug 12, 2018
@@ -69,7 +69,7 @@ if (IS_UNCONSCIOUS(_target) && EGVAR(medical,allowUnconsciousAnimationOnTreatmen

private _isSelf = _caller isEqualTo _target;

if (!_isSelf && {vehicle _target == _target} && {_patientAnim != ""}) then {
if (!_isSelf && {vehicle _target == _target} && {_patientAnim != ""} && {alive _target}) then {
Copy link
Contributor

Choose a reason for hiding this comment

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

we should probably do an isAwake check instead.

Copy link
Contributor

Choose a reason for hiding this comment

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

May only apply to actually dead bodies, not ragdolls?

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe, but otherwise it becomes another easy way to tell if a unit is not alive

Copy link
Member Author

Choose a reason for hiding this comment

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

To be honest I've never actually noticed treatment animations before 😄 Maybe that means they're doing their job though

I'm in favour of an isAwake check 👍

Copy link
Contributor

Choose a reason for hiding this comment

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

Treatment animations have always been disabled by default iirc. Due to some very valid reasons documented in a pr way back. Or maybe just slack?

@kymckay
Copy link
Member Author

kymckay commented Aug 12, 2018

Since we're now using an isAwake check the unconscious treatment animation setting is now obsolete (I suggested it for removal here), do you want me to remove that in this PR also?

@thojkooi
Copy link
Contributor

thojkooi commented Aug 12, 2018

@SilentSpike separate PR I think. All changes in this PR now look good.

edit:
scratch that, after discussing on slack: treatment animations will now never play, since they were supposed to be played on not awake units only - this is done for gameplay purposes. We should instead just simply remove the treatment anim logic all together, to avoid the weird issues with ragdoll.

Copy link
Contributor

@thojkooi thojkooi left a comment

Choose a reason for hiding this comment

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

lgtm

@kymckay kymckay merged commit 0e8ed53 into medical-rewrite Aug 12, 2018
@kymckay kymckay deleted the rw-fix-corpses branch August 12, 2018 11:28
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
@PabstMirror PabstMirror modified the milestones: Medical Rewrite, 3.13.0, 3.13.0-temp3 Dec 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
Development

Successfully merging this pull request may close these issues.

4 participants