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 isNil capitalization

Browse Source
This commit is contained in:
commy2 2015-11-30 17:22:16 +01:00
parent 5e41643cff
commit 2b05f6f451
21 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cargo/functions/fnc_onMenuOpen.sqf
View File

@ -25,7 +25,7 @@ uiNamespace setVariable [QGVAR(menuDisplay), _display];
private ["_display","_loaded", "_ctrl", "_class", "_label"];
disableSerialization;
_display = uiNamespace getVariable QGVAR(menuDisplay);
if (isnil "_display") exitWith {
if (isNil "_display") exitWith {
[_this select 1] call CBA_fnc_removePerFrameHandler;
};

2
addons/common/functions/fnc_blurScreen.sqf
View File

@ -28,7 +28,7 @@ if (_show) then {
GVAR(SHOW_BLUR_SCREEN_COLLECTION) pushBack _id;
// show blur
if (isnil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
if (isNil QGVAR(MENU_ppHandle_GUI_BLUR_SCREEN)) then {
GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) = ppEffectCreate ["DynamicBlur", 102];
GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectAdjust [0.9];
GVAR(MENU_ppHandle_GUI_BLUR_SCREEN) ppEffectEnable true;

6
addons/common/functions/fnc_onAnswerRequest.sqf
View File

@ -18,7 +18,7 @@ private ["_requestID", "_info", "_callBack", "_caller", "_replyParams", "_reques
_info = _unit getvariable _id;
if (!isnil "_info") then {
if (!isNil "_info") then {
_caller = _info select 0;
_target = _info select 1;
_requestID = _info select 2;
@ -31,11 +31,11 @@ if (!isnil "_info") then {
GVAR(RECIEVE_REQUEST_ID_KEY_BINDING) = nil;
if (!isnil QGVAR(RECIEVE_REQUEST_ADD_ACTION_ACCEPT)) then {
if (!isNil QGVAR(RECIEVE_REQUEST_ADD_ACTION_ACCEPT)) then {
_unit removeAction GVAR(RECIEVE_REQUEST_ADD_ACTION_ACCEPT);
GVAR(RECIEVE_REQUEST_ADD_ACTION_ACCEPT) = nil;
};
if (!isnil QGVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE)) then {
if (!isNil QGVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE)) then {
_unit removeAction GVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE);
GVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE) = nil;
};

2
addons/medical/functions/fnc_addUnconsciousCondition.sqf
View File

@ -12,7 +12,7 @@
*/
#include "script_component.hpp"
if (isnil QGVAR(unconsciousConditions)) then {
if (isNil QGVAR(unconsciousConditions)) then {
GVAR(unconsciousConditions) = [];
};
if (typeName _this == typeName []) then {

4
addons/medical/functions/fnc_canTreat.sqf
View File

@ -52,7 +52,7 @@ if !("All" in _allowedSelections || {(_selectionName in _allowedSelections)}) ex
_return = true;
if (getText (_config >> "condition") != "") then {
_condition = getText (_config >> "condition");
if (isnil _condition) then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getvariable _condition;
@ -83,7 +83,7 @@ _medVeh = {([_caller] call FUNC(isInMedicalVehicle)) || ([_target] call FUNC(isI
if (_x == "field") exitWith {_return = true;};
if (_x == "MedicalFacility" && _medFacility) exitWith {_return = true;};
if (_x == "MedicalVehicle" && _medVeh) exitWith {_return = true;};
if !(isnil _x) exitWith {
if !(isNil _x) exitWith {
private "_val";
_val = missionNamespace getvariable _x;
if (typeName _val == "SCALAR") then {

2
addons/medical/functions/fnc_createLitter.sqf
View File

@ -66,7 +66,7 @@ _createdLitter = [];
if (toLower _selection in [toLower _selectionName, "all"]) then { // in is case sensitve. We can be forgiving here, so lets use toLower.
if (isnil _litterCondition) then {
if (isNil _litterCondition) then {
_litterCondition = if (_litterCondition != "") then {compile _litterCondition} else {{true}};
} else {
_litterCondition = missionNamespace getvariable _litterCondition;

4
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -47,7 +47,7 @@ if (_show) then {
disableSerialization;
_display = uiNamespace getvariable QGVAR(DisplayInformation);
if (isnil "_display") exitWith {
if (isNil "_display") exitWith {
[_idPFH] call CBA_fnc_removePerFrameHandler;
};
@ -77,7 +77,7 @@ if (_show) then {
{
private "_value";
_value = _target getvariable _x;
if !(isnil "_value") then {
if !(isNil "_value") then {
_totalIvVolume = _totalIvVolume + (_target getvariable [_x, 0]);
};
} foreach GVAR(IVBags);

2
addons/medical/functions/fnc_displayTriageCard.sqf
View File

@ -33,7 +33,7 @@ if (_show) then {
disableSerialization;
_display = uiNamespace getvariable QGVAR(triageCard);
if (isnil "_display") exitWith {
if (isNil "_display") exitWith {
[_idPFH] call CBA_fnc_removePerFrameHandler;
};

2
addons/medical/functions/fnc_dropDownTriageCard.sqf
View File

@ -18,7 +18,7 @@ params ["_show"];
disableSerialization;
_display = uiNamespace getvariable QGVAR(triageCard);
if (isnil "_display") exitWith {};
if (isNil "_display") exitWith {};
_pos = [0,0,0,0];
if (_show) then {

2
addons/medical/functions/fnc_getUnconsciousCondition.sqf
View File

@ -16,7 +16,7 @@
private ["_unit","_return"];
params ["_unit"];
if (isnil QGVAR(unconsciousConditions)) then {
if (isNil QGVAR(unconsciousConditions)) then {
GVAR(unconsciousConditions) = [];
};

2
addons/medical/functions/fnc_handleUnitVitals.sqf
View File

@ -184,7 +184,7 @@ if (GVAR(level) >= 2) then {
{
private "_value";
_value = _unit getvariable _x;
if !(isnil "_value") then {
if !(isNil "_value") then {
_unit setvariable [_x,(_unit getvariable [_x, 0]), true];
};
} foreach GVAR(IVBags);

2
addons/medical/functions/fnc_hasItem.sqf
View File

@ -18,7 +18,7 @@
private ["_medic", "_patient", "_item", "_return", "_crew"];
params ["_medic", "_patient", "_item"];
if (isnil QGVAR(setting_allowSharedEquipment)) then {
if (isNil QGVAR(setting_allowSharedEquipment)) then {
GVAR(setting_allowSharedEquipment) = true;
};
if (GVAR(setting_allowSharedEquipment) && {[_patient, _item] call EFUNC(common,hasItem)}) exitWith {

2
addons/medical/functions/fnc_hasMedicalEnabled.sqf
View File

@ -20,7 +20,7 @@ private "_medicalEnabled";
params ["_unit"];
_medicalEnabled = _unit getvariable QGVAR(enableMedical);
if (isnil "_medicalEnabled") exitWith {
if (isNil "_medicalEnabled") exitWith {
(((GVAR(enableFor) == 0 && (isPlayer _unit || (_unit getvariable [QEGVAR(common,isDeadPlayer), false])))) || (GVAR(enableFor) == 1) || GVAR(level) == 1)
};

6
addons/medical/functions/fnc_treatment.sqf
View File

@ -60,7 +60,7 @@ _return = true;
if (isText (_config >> "Condition")) then {
_condition = getText(_config >> "condition");
if (_condition != "") then {
if (isnil _condition) then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getvariable _condition;
@ -95,7 +95,7 @@ if ("All" in _locations) then {
if (_x == "field") exitWith {_return = true;};
if (_x == "MedicalFacility" && _medFacility) exitWith {_return = true;};
if (_x == "MedicalVehicle" && _medVeh) exitWith {_return = true;};
if !(isnil _x) exitWith {
if !(isNil _x) exitWith {
private "_val";
_val = missionNamespace getvariable _x;
if (typeName _val == "SCALAR") then {
@ -200,7 +200,7 @@ _treatmentTime = if (isNumber (_config >> "treatmentTime")) then {
} else {
if (isText (_config >> "treatmentTime")) exitWith {
_treatmentTimeConfig = getText(_config >> "treatmentTime");
if (isnil _treatmentTimeConfig) then {
if (isNil _treatmentTimeConfig) then {
_treatmentTimeConfig = compile _treatmentTimeConfig;
} else {
_treatmentTimeConfig = missionNamespace getvariable _treatmentTimeConfig;

2
addons/medical/functions/fnc_useItem.sqf
View File

@ -19,7 +19,7 @@
private ["_return","_crew"];
params ["_medic", "_patient", "_item"];
if (isnil QGVAR(setting_allowSharedEquipment)) then {
if (isNil QGVAR(setting_allowSharedEquipment)) then {
GVAR(setting_allowSharedEquipment) = true;
};

2
addons/modules/XEH_postInit.sqf
View File

@ -21,7 +21,7 @@
private _isPersistent = getNumber (_config >> "isPersistent") > 0 || getnumber (_config >> "isGlobal") > 1;
private _isSingular = getNumber (_config >> "isSingular") > 0;
private _function = getText (_config >> "function");
if (isnil _function) then {
if (isNil _function) then {
_function = compile _function;
} else {
_function = missionNamespace getvariable _function;

4
addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf
View File

@ -67,7 +67,7 @@ _text = format ["
{
_var = missionNamespace getVariable [_x, nil];
if(!isnil "_var" && {(typeName _var) == "ARRAY"} && {(count _var) > MIN_ARRAY_SIZE}) then {
if(!isNil "_var" && {(typeName _var) == "ARRAY"} && {(count _var) > MIN_ARRAY_SIZE}) then {
_text = format ["%1 - ARRAY SIZE: %2", _x, (count _var)];
[_text] call _outputText;
};
@ -77,7 +77,7 @@ _text = format ["
_unit = _x;
{
_var = _unit getVariable [_x, nil];
if(!isnil "_var" && {(typeName _var) == "ARRAY"} && {(count _var) > MIN_ARRAY_SIZE}) then {
if(!isNil "_var" && {(typeName _var) == "ARRAY"} && {(count _var) > MIN_ARRAY_SIZE}) then {
_text = format ["%1 on [%2] - ARRAY SIZE: %3", _x, _unit, (count _var)];
[_text] call _outputText;
};

4
addons/repair/functions/fnc_canRepair.sqf
View File

@ -54,7 +54,7 @@ if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitWith {fa
_return = true;
if (getText (_config >> "condition") != "") then {
_condition = getText (_config >> "condition");
if (isnil _condition) then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getVariable _condition;
@ -86,7 +86,7 @@ _repairVeh = {([_caller] call FUNC(isNearRepairVehicle)) || ([_target] call FUNC
if (_x == "field") exitWith {_return = true;};
if (_x == "RepairFacility" && _repairFacility) exitWith {_return = true;};
if (_x == "RepairVehicle" && _repairVeh) exitWith {_return = true;};
if !(isnil _x) exitWith {
if !(isNil _x) exitWith {
private "_val";
_val = missionNamespace getVariable _x;
if (typeName _val == "SCALAR") then {

6
addons/repair/functions/fnc_repair.sqf
View File

@ -54,7 +54,7 @@ if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitWith {fa
_return = true;
if (getText (_config >> "condition") != "") then {
_condition = getText (_config >> "condition");
if (isnil _condition) then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getVariable _condition;
@ -85,7 +85,7 @@ _repairVeh = {([_caller] call FUNC(isNearRepairVehicle)) || ([_target] call FUNC
if (_x == "field") exitWith {_return = true;};
if (_x == "RepairFacility" && _repairFacility) exitWith {_return = true;};
if (_x == "RepairVehicle" && _repairVeh) exitWith {_return = true;};
if !(isnil _x) exitWith {
if !(isNil _x) exitWith {
private "_val";
_val = missionNamespace getVariable _x;
if (typeName _val == "SCALAR") then {
@ -162,7 +162,7 @@ _repairTime = if (isNumber (_config >> "repairingTime")) then {
} else {
if (isText (_config >> "repairingTime")) exitWith {
_repairTimeConfig = getText(_config >> "repairingTime");
if (isnil _repairTimeConfig) then {
if (isNil _repairTimeConfig) then {
_repairTimeConfig = compile _repairTimeConfig;
} else {
_repairTimeConfig = missionNamespace getVariable _repairTimeConfig;

2
addons/zeus/functions/fnc_bi_moduleCurator.sqf
View File

@ -319,7 +319,7 @@ if (_activated) then {
//--- Show hint about pinging for players
if (
isnil {profilenamespace getvariable "bis_fnc_curatorPinged_done"}
isNil {profilenamespace getvariable "bis_fnc_curatorPinged_done"}
&&
{isTutHintsEnabled}
&&

4
addons/zeus/functions/fnc_bi_moduleProjectile.sqf
View File

@ -17,7 +17,7 @@
#include "script_component.hpp"
_fnc_scriptNameParentTemp = if !(isnil '_fnc_scriptName') then {_fnc_scriptName} else {'BIS_fnc_moduleProjectile'};
_fnc_scriptNameParentTemp = if !(isNil '_fnc_scriptName') then {_fnc_scriptName} else {'BIS_fnc_moduleProjectile'};
private ['_fnc_scriptNameParent'];
_fnc_scriptNameParent = _fnc_scriptNameParentTemp;
_fnc_scriptNameParentTemp = nil;
@ -128,7 +128,7 @@ if (_activated) then {
if (_attach) then {_projectile attachto [_logic,[0,0,_altitude]];};
// Added by ace_zeus for ace_frag compatibility
if (!isnil QEFUNC(frag,addPfhRound)) then {
if (!isNil QEFUNC(frag,addPfhRound)) then {
[objNull, _ammo, _projectile, true] call EFUNC(frag,addPfhRound);
};