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

Fix merge conficlts

Browse Source
This commit is contained in:
PabstMirror 2016-08-09 12:14:30 -05:00
parent 6c63d3c23a
commit 011c6a0d00
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/medical_treatment/functions/fnc_treatmentAdvanced_bandageLocal.sqf
View File

@ -158,7 +158,7 @@ if (EGVAR(medical,healHitPointAfterAdvBandage) || {EGVAR(medical,level) < 2}) th
} forEach _currentWounds;
// ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"]
private _bodyStatus = _target getVariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]];
private _bodyStatus = _target getVariable [QEGVAR(medical,bodyPartStatus), [0,0,0,0,0,0]];
// Any body part that has no wounds is healed to full health
if (_headWounds == 0) then {
@ -180,9 +180,9 @@ if (EGVAR(medical,healHitPointAfterAdvBandage) || {EGVAR(medical,level) < 2}) th
_bodyStatus set [5, 0];
};
_target setVariable [QGVAR(bodyPartStatus), _bodyStatus, true];
_target setVariable [QEGVAR(medical,bodyPartStatus), _bodyStatus, true];
[_target] call FUNC(handleDamage_advancedSetDamage);
[_target] call EFUNC(medical_damage,setDamage);
};
true;