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.

Sign up for GitHub

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

Medical Status - Add isDamageAllowed check to setDead #8803

Merged
merged 7 commits into from
Feb 6, 2022
Merged

Medical Status - Add isDamageAllowed check to setDead #8803

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bfd137a
add delay & logs
LinkIsGrim Jan 27, 2022
278e15e
add remote support
LinkIsGrim Jan 27, 2022
523c231
isDamageAllowed check
LinkIsGrim Jan 27, 2022
71ec91f
add internal comment to setDead event
LinkIsGrim Jan 31, 2022
49f04cc
remove remote setDead EH
LinkIsGrim Feb 5, 2022
f7d1072
remove unnecessary changes
LinkIsGrim Feb 5, 2022
50f4d63
Add comments and move check below the event
LinkIsGrim Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions addons/medical_status/functions/fnc_setDead.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ _unit setVariable [QEGVAR(medical,causeOfDeath), _reason, true];
// Send a local event before death
[QEGVAR(medical,death), [_unit]] call CBA_fnc_localEvent;

// (#8803) Reenable damage if disabled to prevent having live units in dead state
// Keep this after death event for compatibility with third party hooks
if !(isDamageAllowed _unit) then {
WARNING_1("setDead executed on unit with damage blocked - %1",_this);
_unit allowDamage true;
};

// Kill the unit without changing visual apperance
private _prevDamage = _unit getHitPointDamage "HitHead";

Expand Down