Merge branch 'limping' of https://github.com/acemod/ACE3 into limping

This commit is contained in:
PabstMirror 2019-04-27 11:11:10 -05:00
commit 65601b4081
2 changed files with 3 additions and 3 deletions

View File

@ -145,7 +145,7 @@
_return append _rawMedications;
if (_unit isEqualTo ACE_player) then {
_return pushBack format ["ACE_setCustomAimCoef: %1", [missionNamespace, "ACE_setCustomAimCoef", "max"] call ace_common_fnc_arithmeticGetResult];
_return pushBack format ["ACE_setCustomAimCoef: %1", [missionNamespace, "ACE_setCustomAimCoef", "max"] call EFUNC(common,arithmeticGetResult)];
};
// Footer:

View File

@ -34,8 +34,8 @@ private _classID = 0;
private _minDamage = GET_NUMBER(_entry >> "minDamage",0);
private _maxDamage = GET_NUMBER(_entry >> "maxDamage",-1);
private _causes = GET_ARRAY(_entry >> "causes",[]);
private _causeLimping = 1 == GET_NUMBER(_entry >> "causeLimping",0);
private _causeFracture = 1 == GET_NUMBER(_entry >> "causeFracture",0);
private _causeLimping = GET_NUMBER(_entry >> "causeLimping",0) == 1;
private _causeFracture = GET_NUMBER(_entry >> "causeFracture",0) == 1;
if !(_causes isEqualTo []) then {
GVAR(woundClassNames) pushBack _className;