Skip to content

Commit ed0d9cd

Browse files
committed
ACE3 medical update fix
1 parent 06127fb commit ed0d9cd

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ For questions, comments, or bug reports, please contact me directly at nick.musu
9393
CHANGELOG:
9494
---------------------
9595

96+
v1.31 (January 11, 2020):
97+
* bugfix: two events created on civilian death (related to ACE3 Medical update)
98+
9699
v1.3 (May 25, 2019):
97100
* added: Autopsies
98101
* added: autopsy event handler if concealed death is revealed

addons/GR/functions/fn_onLocalCivKilled.sqf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
params ["_killed", ["_killer", objNull]];
1111

12+
//Workaround for ACE3 Medical bug in which "killed" EH is called twice
13+
if (_killed getVariable ["GR_WASKILLED",0] == 1) exitWith {};
14+
_killed setVariable ["GR_WASKILLED",1];
15+
1216
if(side (group _killed) == civilian) then {
1317
// Workaround for ACE medical
1418
if ((isNull _killer) || {_killer == _killed}) then {

addons/GR/functions/fn_onUnitKilled.sqf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ if (!isServer) exitWith {};
1111

1212
params ["_killed", ["_killer", objNull]];
1313

14+
//Workaround for ACE3 Medical bug in which "killed" EH is called twice
15+
if (_killed getVariable ["GR_WASKILLED",0] == 1) exitWith {};
16+
_killed setVariable ["GR_WASKILLED",1];
17+
1418
if ((isNull _killer) || {_killer == _killed}) then {
1519
_killer = _killed getVariable ["ace_medical_lastDamageSource", objNull];
1620
};

mod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ overview = "Civilian deaths, reparations, and war crimes. Deliver the bodies of
1212
author = "@musurca";
1313
overviewText = "GR";
1414
overviewPicture = "img\logomain.paa";
15-
overviewFootnote = "v130";
15+
overviewFootnote = "v131";

0 commit comments

Comments
 (0)