Merge pull request #2830 from acemod/mixedMedicalDisplay

Display basicMed wounds for AI in mixed mode
This commit is contained in:
Thomas Kooi 2015-11-10 08:33:21 +01:00
commit ec1187e79b
3 changed files with 4 additions and 4 deletions

View File

@ -54,7 +54,7 @@ if (_show) then {
_allInjuryTexts = [];
_genericMessages = [];
if (GVAR(level) >= 2) then {
if (GVAR(level) >= 2 && {([_unit] call FUNC(hasMedicalEnabled))}) then {
_partText = [LSTRING(Head), LSTRING(Torso), LSTRING(LeftArm) ,LSTRING(RightArm) ,LSTRING(LeftLeg), LSTRING(RightLeg)] select _selectionN;
_genericMessages pushback [localize _partText, [1, 1, 1, 1]];
};
@ -87,7 +87,7 @@ if (_show) then {
_damaged = [false, false, false, false, false, false];
_selectionBloodLoss = [0,0,0,0,0,0];
if (GVAR(level) >= 2) then {
if (GVAR(level) >= 2 && {([_target] call FUNC(hasMedicalEnabled))}) then {
_openWounds = _target getvariable [QGVAR(openWounds), []];
private "_amountOf";
{

View File

@ -19,7 +19,7 @@
params ["_target", "_player", "_selectionN", "_actionData"];
if (GVAR(level) < 2) exitwith {
if (GVAR(level) < 2 || {!([_target] call FUNC(hasMedicalEnabled))}) exitwith {
private ["_pointDamage"];
_pointDamage = (_target getvariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]]) select _selectionN;

View File

@ -62,7 +62,7 @@ _damaged = [false, false, false, false, false, false];
_selectionBloodLoss = [0, 0, 0, 0, 0, 0];
_allInjuryTexts = [];
if (EGVAR(medical,level) >= 2) then {
if ((EGVAR(medical,level) >= 2) && {([_target] call EFUNC(medical,hasMedicalEnabled))}) then {
_openWounds = _target getVariable [QEGVAR(medical,openWounds), []];
private "_amountOf";
{