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

Revert quotation on string args

Browse Source
This commit is contained in:
Whigital 2020-02-12 22:07:19 +01:00
parent 56ef0c6d65
commit 8c2f53ac14
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/functions/fnc_cbaSettings.sqf
View File

@ -73,7 +73,7 @@ GVAR(settingsMovedToSQF) = [];
#ifdef DEBUG_MODE_FULL
INFO_1("checking settingsMovedToSQF [%1]",count GVAR(settingsMovedToSQF));
{
if (isNil "_x") then { WARNING_1("setting [%1] NOT moved to sqf",_x); };
if (isNil _x) then { WARNING_1("setting [%1] NOT moved to sqf",_x); };
} forEach GVAR(settingsMovedToSQF);
#endif
}] call CBA_fnc_addEventHandler;
@ -107,7 +107,7 @@ for "_index" from 0 to (_countOptions - 1) do {
if ((toLower _settingName) in GVAR(cbaSettings_forcedSettings)) then {
WARNING_1("Setting [%1] - Already Forced - ignoring missionConfig",_varName);
} else {
if ((isNil "_settingName") && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then {
if ((isNil _settingName) && {(getNumber (_settingsConfig >> _settingName >> "movedToSQF")) == 0}) then {
// New setting, that was first defined in missionConfigFile
INFO_1("Creating new CBA setting for ace_setting from mission config [%1]",_settingName);
[_optionEntry] call FUNC(cbaSettings_loadFromConfig);

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

@ -43,7 +43,7 @@ if (_checkNil) then {
private _nilCheckedList = [];
{
if (!isNil "_x") then {
if (!isNil _x) then {
_nilCheckedList pushBack (missionNamespace getVariable _x);
};
false

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

@ -22,7 +22,7 @@
params ["_logic", "_settingName", "_moduleVariable"];
// Check if the variable is already defined
if (isNil "_settingName") exitWith {
if (isNil _settingName) exitWith {
ERROR_1("readSettingFromModule - param [%1] is not an ace_setting", _settingName);
};

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

@ -31,7 +31,7 @@ TRACE_1("Reading missionConfigFile params",_paramsArray);
TRACE_3("ace_setting",_title,_settingName,_settingValue);
// Check if the variable is already defined
if (isNil "_settingName") exitWith {
if (isNil _settingName) exitWith {
ERROR_1("readSettingsFromParamsArray - param [%1] is not an ace_setting", _settingName);
};

2
addons/medical_feedback/XEH_postInit.sqf
View File

@ -117,7 +117,7 @@ GVAR(bloodTickCounter) = 0;
#ifdef DISABLE_VANILLA_DAMAGE_EFFECTS
TRACE_1("disabling vanilla bleeding feedback effects",_this);
[{
{isNil "_x"} count [
{isNil _x} count [
"BIS_fnc_feedback_damageCC",
"BIS_fnc_feedback_damageRadialBlur",
"BIS_fnc_feedback_damageBlur"

2
addons/medical_treatment/functions/fnc_onMedicationUsage.sqf
View File

@ -53,7 +53,7 @@ if !(_overdosedMedications isEqualTo []) then {
TRACE_1("CriticalVitals Event",_target); // make unconscious
[QEGVAR(medical,CriticalVitals), _target] call CBA_fnc_localEvent;
};
if (isNil "_onOverDose") then {
if (isNil _onOverDose) then {
_onOverDose = compile _onOverDose;
} else {
_onOverDose = missionNamespace getVariable _onOverDose;

2
addons/modules/XEH_postInit.sqf
View File

@ -20,7 +20,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;

2
addons/overpressure/functions/fnc_firedEHBB.sqf
View File

@ -20,7 +20,7 @@ TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectil
// Bake variable name and check if the variable exists, call the caching function otherwise
private _varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
private _var = if (isNil "_varName") then {
private _var = if (isNil _varName) then {
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
} else {
missionNameSpace getVariable _varName;

2
addons/overpressure/functions/fnc_firedEHOP.sqf
View File

@ -20,7 +20,7 @@ TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectil
// Bake variable name and check if the variable exists, call the caching function otherwise
private _varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
private _var = if (isNil "_varName") then {
private _var = if (isNil _varName) then {
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
} else {
missionNameSpace getVariable _varName;

2
addons/overpressure/functions/fnc_overpressureDamage.sqf
View File

@ -25,7 +25,7 @@ params ["_firer", "_posASL", "_direction", "_weapon", "_magazine", "_ammo"];
// Bake variable name and check if the variable exists, call the caching function otherwise
private _varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
private _var = if (isNil "_varName") then {
private _var = if (isNil _varName) then {
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
} else {
missionNameSpace getVariable _varName;

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

@ -48,7 +48,7 @@ if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitWith {fa
private _return = true;
if (getText (_config >> "condition") != "") then {
private _condition = getText (_config >> "condition");
if (isNil "_condition") then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getVariable _condition;
@ -77,7 +77,7 @@ if (!("All" in _repairLocations)) then {
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 = missionNamespace getVariable _x;
if (_val isEqualType 0) then {
_return = switch (_val) do {

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

@ -54,7 +54,7 @@ if (count _items > 0 && {!([_caller, _items] call FUNC(hasItems))}) exitWith {fa
private _return = true;
if (getText (_config >> "condition") != "") then {
private _condition = getText (_config >> "condition");
if (isNil "_condition") then {
if (isNil _condition) then {
_condition = compile _condition;
} else {
_condition = missionNamespace getVariable _condition;
@ -82,7 +82,7 @@ if (!("All" in _repairLocations)) then {
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 = missionNamespace getVariable _x;
if (_val isEqualType 0) then {
_return = switch (_val) do {
@ -139,7 +139,7 @@ if (_callbackProgress == "") then {
(alive _target) && {(abs speed _target) < 1} // make sure vehicle doesn't drive off
};
} else {
if (isNil "_callbackProgress") then {
if (isNil _callbackProgress) then {
_callbackProgress = compile _callbackProgress;
} else {
_callbackProgress = missionNamespace getVariable _callbackProgress;
@ -192,7 +192,7 @@ if (_repairTime < 0) then {
} else {
if (isText (_config >> "repairingTime")) exitWith {
private _repairTimeConfig = getText (_config >> "repairingTime");
if (isNil "_repairTimeConfig") then {
if (isNil _repairTimeConfig) then {
_repairTimeConfig = compile _repairTimeConfig;
} else {
_repairTimeConfig = missionNamespace getVariable _repairTimeConfig;

2
addons/repair/functions/fnc_repair_failure.sqf
View File

@ -56,7 +56,7 @@ if (_weaponSelect != "") then {
private _config = (ConfigFile >> "ACE_Repair" >> "Actions" >> _className);
private _callback = getText (_config >> "callbackFailure");
if (isNil "_callback") then {
if (isNil _callback) then {
_callback = compile _callback;
} else {
_callback = missionNamespace getVariable _callback;

2
addons/repair/functions/fnc_repair_success.sqf
View File

@ -51,7 +51,7 @@ if (_weaponSelect != "") then {
private _config = (ConfigFile >> "ACE_Repair" >> "Actions" >> _className);
private _callback = getText (_config >> "callbackSuccess");
if (isNil "_callback") then {
if (isNil _callback) then {
_callback = compile _callback;
} else {
_callback = missionNamespace getVariable _callback;

2
addons/respawn/functions/fnc_initRallypoint.sqf
View File

@ -21,7 +21,7 @@ params ["_rallypoint", "_respawnMarker", "_side"];
private _name = typeOf _rallypoint;
if (isNil "_name") then {
if (isNil _name) then {
missionNamespace setVariable [_name, _rallypoint];
_rallypoint setVariable [QGVAR(side), _side];