From 8c6df1b00c96f39b34c7fb2c2f16fc18161890cc Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Sat, 28 Feb 2015 15:23:12 +0100 Subject: [PATCH] Fix indentation in treatment --- addons/medical/functions/fnc_treatment.sqf | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/medical/functions/fnc_treatment.sqf b/addons/medical/functions/fnc_treatment.sqf index a0e6bcb6ff..121cf6b277 100644 --- a/addons/medical/functions/fnc_treatment.sqf +++ b/addons/medical/functions/fnc_treatment.sqf @@ -24,7 +24,7 @@ _className = _this select 3; _config = (ConfigFile >> "ACE_Medical_Treatments" >> "Basic" >> _className); if (GVAR(level)>=1) then { - _config = (ConfigFile >> "ACE_Medical_Treatments" >> "Advanced" >> _className); + _config = (ConfigFile >> "ACE_Medical_Treatments" >> "Advanced" >> _className); }; if !(isClass _config) exitwith {false}; @@ -38,13 +38,13 @@ _locations = getArray (_config >> "treatmentLocations"); _return = false; if ("All" in _locations) then { - _return = true; + _return = true; } else { - { - if (_x == "field") exitwith {_return = true;}; - if (_x == "MedicalFacility" && {([_caller] call FUNC(isInMedicalFacility)) || ([_target] call FUNC(isInMedicalFacility))}) exitwith {_return = true;}; - if (_x == "MedicalVehicle" && {([vehicle _caller] call FUNC(isMedicalVehicle)) || ([vehicle _target] call FUNC(isMedicalVehicle))}) exitwith {_return = true;}; - }foreach _locations; + { + if (_x == "field") exitwith {_return = true;}; + if (_x == "MedicalFacility" && {([_caller] call FUNC(isInMedicalFacility)) || ([_target] call FUNC(isInMedicalFacility))}) exitwith {_return = true;}; + if (_x == "MedicalVehicle" && {([vehicle _caller] call FUNC(isMedicalVehicle)) || ([vehicle _target] call FUNC(isMedicalVehicle))}) exitwith {_return = true;}; + }foreach _locations; }; if !(_return) exitwith {false}; @@ -52,25 +52,25 @@ if !(_return) exitwith {false}; // Parse the config for the success callback _callbackSuccess = getText (_config >> "callbackSuccess"); if (isNil _callbackSuccess) then { - _callbackSuccess = compile _callbackSuccess; + _callbackSuccess = compile _callbackSuccess; } else { - _callbackSuccess = missionNamespace getvariable _callbackSuccess; + _callbackSuccess = missionNamespace getvariable _callbackSuccess; }; // Parse the config for the failure callback _callbackFailure = getText (_config >> "callbackFailure"); if (isNil _callbackFailure) then { - _callbackFailure = compile _callbackFailure; + _callbackFailure = compile _callbackFailure; } else { - _callbackFailure = missionNamespace getvariable _callbackFailure; + _callbackFailure = missionNamespace getvariable _callbackFailure; }; // Parse the config for the progress callback _callbackProgress = getText (_config >> "callbackProgress"); if (isNil _callbackProgress) then { - _callbackProgress = compile _callbackProgress; + _callbackProgress = compile _callbackProgress; } else { - _callbackProgress = missionNamespace getvariable _callbackProgress; + _callbackProgress = missionNamespace getvariable _callbackProgress; }; _treatmentTime = getNumber (_config >> "treatmentTime"); @@ -78,7 +78,7 @@ _treatmentTime = getNumber (_config >> "treatmentTime"); _callerAnim = [getText (_config >> "animationCaller"), getText (_config >> "animationCallerProne")] select (stance _caller == "PRONE"); if (_caller == _target) then { - _callerAnim = [getText (_config >> "animationCallerSelf"), getText (_config >> "animationCallerSelfProne")] select (stance _caller == "PRONE"); + _callerAnim = [getText (_config >> "animationCallerSelf"), getText (_config >> "animationCallerSelfProne")] select (stance _caller == "PRONE"); }; _wpn = ["non", "rfl", "pst"] select (["", primaryWeapon _caller, handgunWeapon _caller] find (currentWeapon _caller)); _callerAnim = [_callerAnim, "[wpn]", _wpn] call CBA_fnc_replace; @@ -86,20 +86,20 @@ _callerAnim = [_callerAnim, "[wpn]", _wpn] call CBA_fnc_replace; _patientAnim = getText (_confg >> "animationPatient"); if (_caller != _target && {vehicle _target == _target} && {_patientAnim != ""}) then { - [_target, _patientAnim] call EFUNC(common,doAnimation); + [_target, _patientAnim] call EFUNC(common,doAnimation); }; if (vehicle _caller == _caller && {_callerAnim != ""}) then { - if (primaryWeapon _caller == "") then { - _caller addWeapon "ACE_FakePrimaryWeapon"; - }; - _caller selectWeapon (primaryWeapon _caller); - _caller setvariable [QGVAR(treatmentPrevAnimCaller), animationState _target]; - [_caller, _callerAnim] call EFUNC(common,doAnimation); + if (primaryWeapon _caller == "") then { + _caller addWeapon "ACE_FakePrimaryWeapon"; + }; + _caller selectWeapon (primaryWeapon _caller); + _caller setvariable [QGVAR(treatmentPrevAnimCaller), animationState _target]; + [_caller, _callerAnim] call EFUNC(common,doAnimation); }; _iconDisplayed = getText (_config >> "actionIconPath"); if (_iconDisplayed != "") then { - [QGVAR(treatmentActionIcon), true, _iconDisplayed, [1,1,1,1], getNumber(_config >> "actionIconDisplayTime");] call EFUNC(common,displayIcon); + [QGVAR(treatmentActionIcon), true, _iconDisplayed, [1,1,1,1], getNumber(_config >> "actionIconDisplayTime");] call EFUNC(common,displayIcon); }; true;