Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Medical Status - Fix double execution of killed event (#7561)

Browse Source 
* fix double execution of killed event

* revert the execNextFrame change

* make second execution run with null

* make second execution run with null
This commit is contained in:
commy2 2020-02-29 23:09:00 +01:00 committed by GitHub
parent d87d051d23
commit 15b4b98e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/medical_status/XEH_PREP.hpp
View File

@ -6,6 +6,7 @@ PREP(getBloodVolumeChange);
PREP(getCardiacOutput);
PREP(getMedicationCount);
PREP(handleKilled);
PREP(handleKilledMission);
PREP(hasStableVitals);
PREP(initUnit);
PREP(isBeingCarried);

2
addons/medical_status/XEH_preInit.sqf
View File

@ -23,4 +23,6 @@ PREP_RECOMPILE_END;
#endif
}, nil, [IGNORE_BASE_UAVPILOTS], true] call CBA_fnc_addClassEventHandler;
addMissionEventHandler ["EntityKilled", {_this call FUNC(handleKilledMission)}];
ADDON = true;

11
addons/medical_status/functions/fnc_handleKilled.sqf
View File

@ -21,6 +21,14 @@
params ["_unit", "_killer", "_instigator", "_useEffects"];
TRACE_4("handleKilled",_unit,_killer,_instigator,_useEffects);
// ensure event is only called once
if (_unit isEqualTo (_unit getVariable [QGVAR(killed), objNull])) exitWith {
_this set [0, objNull];
_this set [1, objNull];
_this set [2, objNull];
};
_unit setVariable [QGVAR(killed), _unit];
private _causeOfDeath = _unit getVariable [QEGVAR(medical,causeOfDeath), "#scripted"];
// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect)
@ -36,9 +44,6 @@ if (_causeOfDeath != "#scripted") then {
};
TRACE_3("killer info",_killer,_instigator,_causeOfDeath);
if (_unit isEqualTo (_unit getVariable [QGVAR(killed), objNull])) exitWith {}; // ensure event is only called once
_unit setVariable [QGVAR(killed), _unit];
if (_unit == player) then {
// Enable user input before respawn, in case mission is using respawnTemplates
["unconscious", false] call EFUNC(common,setDisableUserInputStatus);

45
addons/medical_status/functions/fnc_handleKilledMission.sqf Normal file
View File

@ -0,0 +1,45 @@
#include "script_component.hpp"
/*
* Author: PabstMirror
* Vanilla EntityKilled mission EH, attempts to set correct source/killer for other killed event handlers.
*
* Arguments:
* 0: Unit <OBJECT>
* 1: Killer <OBJECT>
* 2: Instigator <OBJECT>
* 3: Use Effects <BOOL>
*
* Return Value:
* None
*
* Example:
* [cursorObject, player, player, true] call ace_medical_status_fnc_handleKilledMission
*
* Public: No
*/
params ["_unit", "_killer", "_instigator", "_useEffects"];
TRACE_4("handleKilledMission",_unit,_killer,_instigator,_useEffects);
// ensure event is only called once
if (_unit isEqualTo (_unit getVariable [QGVAR(killedMission), objNull])) exitWith {
_this set [0, objNull];
_this set [1, objNull];
_this set [2, objNull];
};
_unit setVariable [QGVAR(killedMission), _unit];
private _causeOfDeath = _unit getVariable [QEGVAR(medical,causeOfDeath), "#scripted"];
// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect)
if (_causeOfDeath != "#scripted") then {
_killer = _unit getVariable [QEGVAR(medical,lastDamageSource), _killer]; // vehicle
_instigator = _unit getVariable [QEGVAR(medical,lastInstigator), _instigator]; // unit in the turret
// All Killed EHs uses the same array, so we can modify it now to pass the correct killer/instigator
if (missionNamespace getVariable [QEGVAR(medical,modifyKilledArray), true]) then { // getVar so this can be disabled
_this set [1, _killer];
_this set [2, _instigator];
};
};
TRACE_3("killer mission info",_killer,_instigator,_causeOfDeath);