diff --git a/addons/danger/XEH_preInit.sqf b/addons/danger/XEH_preInit.sqf
index 3c1b77e1..f95219f8 100644
--- a/addons/danger/XEH_preInit.sqf
+++ b/addons/danger/XEH_preInit.sqf
@@ -3,7 +3,7 @@ ADDON = false;
#include "XEH_PREP.hpp"
// mod check
-GVAR(Loaded_WP) = isClass (configfile >> "CfgPatches" >> "lambs_wp");
+GVAR(Loaded_WP) = isClass (configFile >> "CfgPatches" >> "lambs_wp");
#include "settings.inc.sqf"
diff --git a/addons/danger/XEH_preInitClient.sqf b/addons/danger/XEH_preInitClient.sqf
index 767ec12e..ce961a47 100644
--- a/addons/danger/XEH_preInitClient.sqf
+++ b/addons/danger/XEH_preInitClient.sqf
@@ -23,14 +23,14 @@ private _fnc_toggle_AI = {
GVAR(disableAIPlayerGroup) = false;
{
_x setVariable [QGVAR(disableAI), false]; // added to ensure it triggers -- nkenny
- } foreach units player;
+ } forEach units player;
} else {
(group player) setVariable [QEGVAR(main,groupMemory), []];
GVAR(disableAIPlayerGroup) = true;
{
_x setUnitPosWeak "AUTO";
_x setVariable [QGVAR(disableAI), true];
- } foreach units player;
+ } forEach units player;
};
private _txt = format ["%1 toggled AI %2", side player, ["on", "off"] select (GVAR(disableAIPlayerGroup))];
[["LAMBS Danger.fsm"], [_txt, 1.4], true] call CBA_fnc_notify;
@@ -68,7 +68,7 @@ private _fnc_suppress_AI = {
}, [_x, _firePos, true], random 1.5
] call CBA_fnc_waitAndExecute;
};
- } foreach _units;
+ } forEach _units;
private _txt = format ["%1 quick suppression (%2 units)", side player, count _units];
[["LAMBS Danger.fsm"], [_txt, 1.4]] call CBA_fnc_notify;
true
@@ -81,7 +81,7 @@ private _fnc_hide_AI = {
private _units = (units player) select {player distance2D _x < 55 && {!isPlayer _x}};
{
[_x, _pos, 12, _buildings] call EFUNC(main,doHide);
- } foreach _units;
+ } forEach _units;
private _txt = format ["%1 quick hide (%2 units | %3 spots)", side player, count _units, count _buildings];
[["LAMBS Danger.fsm"], [_txt, 1.4]] call CBA_fnc_notify;
true
@@ -112,7 +112,7 @@ private _fnc_assault_AI = {
} else {
[_x, _enemy] call EFUNC(main,doAssault);
};
- } foreach _units;
+ } forEach _units;
private _txt = format ["%1 quick assault (%2 units | %3 spots)", side player, count _units, count ((group player) getVariable [QEGVAR(main,groupMemory), []])];
[["LAMBS Danger.fsm"], [_txt, 1.4]] call CBA_fnc_notify;
true
diff --git a/addons/danger/functions/fnc_brain.sqf b/addons/danger/functions/fnc_brain.sqf
index 60e6a2c9..342263ec 100644
--- a/addons/danger/functions/fnc_brain.sqf
+++ b/addons/danger/functions/fnc_brain.sqf
@@ -68,7 +68,7 @@ private _index = -1;
_index = _forEachIndex;
_priority = _priorities select _cause;
};
-} foreach _queue;
+} forEach _queue;
// select cause
private _causeArray = _queue select _index;
diff --git a/addons/danger/functions/fnc_brainEngage.sqf b/addons/danger/functions/fnc_brainEngage.sqf
index 84eae726..3d7d6928 100644
--- a/addons/danger/functions/fnc_brainEngage.sqf
+++ b/addons/danger/functions/fnc_brainEngage.sqf
@@ -66,9 +66,9 @@ if (
&& {RND(getSuppression _unit)}
&& {_type isEqualTo DANGER_CANFIRE}
) exitWith {
- private _posASL = ATLtoASL (_unit getHideFrom _target);
- if (((ASLtoAGL _posASL) select 2) > 6) then {
- _posASL = ASLtoAGL _posASL;
+ private _posASL = ATLToASL (_unit getHideFrom _target);
+ if (((ASLToAGL _posASL) select 2) > 6) then {
+ _posASL = ASLToAGL _posASL;
_posASL set [2, 0.5];
_posASL = AGLToASL _posASL
};
diff --git a/addons/danger/functions/fnc_brainVehicle.sqf b/addons/danger/functions/fnc_brainVehicle.sqf
index 7e89a559..3ba95179 100644
--- a/addons/danger/functions/fnc_brainVehicle.sqf
+++ b/addons/danger/functions/fnc_brainVehicle.sqf
@@ -41,7 +41,7 @@ private _index = -1;
_index = _forEachIndex;
_priority = _priorities select _cause;
};
-} foreach _queue;
+} forEach _queue;
// select cause
private _causeArray = _queue select _index;
@@ -57,7 +57,7 @@ private _attack = _cause in [DANGER_ENEMYDETECTED, DANGER_ENEMYNEAR, DANGER_HIT,
if (_attack) then {
private _dangerPos = _unit getHideFrom _dangerCausedBy;
if (_dangerPos isEqualTo [0, 0, 0]) exitWith {_attack = false;};
- _dangerPos = ASLtoAGL (ATLtoASL _dangerPos);
+ _dangerPos = ASLToAGL (ATLToASL _dangerPos);
if ((_dangerPos select 2) > 6 || {(_dangerPos select 2) < 2}) then {_dangerPos set [2, 1]};
};
@@ -178,7 +178,7 @@ if (_armored && {!isNull _dangerCausedBy}) exitWith {
// delayed unload
[
{
- params [["_cargo", []], ["_side", EAST], ["_vehicle", objNull]];
+ params [["_cargo", []], ["_side", east], ["_vehicle", objNull]];
_cargo orderGetIn false;
_cargo allowGetIn false;
if (EGVAR(main,debug_functions)) then {["%1 %2 unloading %3 carried troops", _side, getText (configOf _vehicle >> "displayName"), count _cargo] call EFUNC(main,debugLog);};
@@ -226,7 +226,7 @@ if (_car) exitWith {
};
// look to danger
- if (_attack && {_vehicle knowsAbout _dangerCausedBy > 3}) then {_vehicle doWatch (AGLtoASL _dangerPos);};
+ if (_attack && {_vehicle knowsAbout _dangerCausedBy > 3}) then {_vehicle doWatch (AGLToASL _dangerPos);};
// suppression
if (_attack && {_slow}) then {
diff --git a/addons/danger/functions/fnc_tacticsAssault.sqf b/addons/danger/functions/fnc_tacticsAssault.sqf
index 190534ee..2bb872e3 100644
--- a/addons/danger/functions/fnc_tacticsAssault.sqf
+++ b/addons/danger/functions/fnc_tacticsAssault.sqf
@@ -51,7 +51,7 @@ if ((_target select 2) > 6) then {
_x setUnitPos "AUTO";
_x doFollow leader _x;
_x forceSpeed -1;
- } foreach (units _group);
+ } forEach (units _group);
};
},
[_group, attackEnabled _group, _unit isIRLaserOn (currentWeapon _unit), speedMode _group, formation _group],
@@ -77,7 +77,7 @@ _buildings = _buildings apply { _x select 1 };
private _housePos = [];
{
_housePos append (_x buildingPos -1);
-} foreach _buildings;
+} forEach _buildings;
// add building positions to group memory
_group setVariable [QEGVAR(main,groupMemory), _housePos];
@@ -87,11 +87,11 @@ if (_housePos isEqualTo []) then {_housePos pushBack _target;};
// find vehicles
private _vehicles = [_unit] call EFUNC(main,findReadyVehicles);
-private _overwatch = [ASLtoAGL (getPosASL _unit), EGVAR(main,minSuppressionRange) * 2, EGVAR(main,minSuppressionRange), 4, _target] call EFUNC(main,findOverwatch);
+private _overwatch = [ASLToAGL (getPosASL _unit), EGVAR(main,minSuppressionRange) * 2, EGVAR(main,minSuppressionRange), 4, _target] call EFUNC(main,findOverwatch);
if (_overwatch isNotEqualTo []) then {
{
private _roads = _overwatch nearRoads 30;
- if (_roads isNotEqualTo []) then {_overwatch = ASLtoAGL (getPosASL (selectRandom _roads))};
+ if (_roads isNotEqualTo []) then {_overwatch = ASLToAGL (getPosASL (selectRandom _roads))};
_x doMove _overwatch;
_x doWatch (selectRandom _housePos);
} forEach _vehicles;
@@ -129,7 +129,7 @@ _units doWatch objNull;
// check for reload
{
reload _x;
-} foreach (_units select {getSuppression _x < 0.7 && {needReload _x > 0.6}});
+} forEach (_units select {getSuppression _x < 0.7 && {needReload _x > 0.6}});
// execute function
[{_this call EFUNC(main,doGroupAssault)}, [_cycle, _units + [_unit], _housePos], 2 + random 3] call CBA_fnc_waitAndExecute;
@@ -139,7 +139,7 @@ if (EGVAR(main,debug_functions)) then {
["%1 TACTICS ASSAULT (%2 with %3 units @ %4m with %5 buildings)", side _unit, name _unit, count _units, round (_unit distance2D _target), count _buildings] call EFUNC(main,debugLog);
private _m = [_unit, "tactics assault", _unit call EFUNC(main,debugMarkerColor), "hd_arrow"] call EFUNC(main,dotMarker);
private _mt = [_target, "", _unit call EFUNC(main,debugMarkerColor), "hd_join"] call EFUNC(main,dotMarker);
- {_x setMarkerSizeLocal [0.6, 0.6];} foreach [_m, _mt];
+ {_x setMarkerSizeLocal [0.6, 0.6];} forEach [_m, _mt];
_m setMarkerDirLocal (_unit getDir _target);
[{{deleteMarker _x;true} count _this;}, [_m, _mt], _delay + 30] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/danger/functions/fnc_tacticsAttack.sqf b/addons/danger/functions/fnc_tacticsAttack.sqf
index 1f167acb..596e35d5 100644
--- a/addons/danger/functions/fnc_tacticsAttack.sqf
+++ b/addons/danger/functions/fnc_tacticsAttack.sqf
@@ -79,14 +79,14 @@ private _targetVehicle = vehicle _target;
_x doWatch _targetVehicle;
_x doTarget _targetVehicle;
_x doFire _targetVehicle;
-} foreach _units;
+} forEach _units;
// debug
if (EGVAR(main,debug_functions)) then {
["%1 TACTICS ATTACK (%2 with %3 units @ %4m)", side _unit, name _unit, count _units, round (_unit distance2D _target)] call EFUNC(main,debugLog);
private _m = [_unit, "tactics attack", _unit call EFUNC(main,debugMarkerColor), "hd_arrow"] call EFUNC(main,dotMarker);
private _mt = [_target, "", _unit call EFUNC(main,debugMarkerColor), "hd_destroy"] call EFUNC(main,dotMarker);
- {_x setMarkerSizeLocal [0.6, 0.6];} foreach [_m, _mt];
+ {_x setMarkerSizeLocal [0.6, 0.6];} forEach [_m, _mt];
_m setMarkerDirLocal (_unit getDir _target);
[{{deleteMarker _x;true} count _this;}, [_m, _mt], _delay + 30] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/danger/functions/fnc_tacticsContact.sqf b/addons/danger/functions/fnc_tacticsContact.sqf
index f5042675..e6f58f21 100644
--- a/addons/danger/functions/fnc_tacticsContact.sqf
+++ b/addons/danger/functions/fnc_tacticsContact.sqf
@@ -117,7 +117,7 @@ if (
// get position
private _posASL = _unit getHideFrom _enemy;
- if (((ASLtoAGL _posASL) select 2) > 6) then {_posASL set [2, 0.5];};
+ if (((ASLToAGL _posASL) select 2) > 6) then {_posASL set [2, 0.5];};
_posASL = ATLToASL _posASL;
// execute suppression
@@ -135,7 +135,7 @@ if (
[_x, _posASL],
8
] call CBA_fnc_waitAndExecute;
- } foreach _units;
+ } forEach _units;
// group variable
_group setVariable [QEGVAR(main,currentTactic), "Contact! (suppress)", EGVAR(main,debug_functions)];
@@ -184,7 +184,7 @@ if (
_x forceSpeed 3;
_x setVariable [QEGVAR(main,currentTask), "Assault (contact)", EGVAR(main,debug_functions)];
- } foreach _units;
+ } forEach _units;
_units doMove (selectRandom _buildings);
// group variable
diff --git a/addons/danger/functions/fnc_tacticsFlank.sqf b/addons/danger/functions/fnc_tacticsFlank.sqf
index c2a7eb7e..1df129b2 100644
--- a/addons/danger/functions/fnc_tacticsFlank.sqf
+++ b/addons/danger/functions/fnc_tacticsFlank.sqf
@@ -54,7 +54,7 @@ if (_unit distance2D _target < GVAR(cqbRange)) exitWith {
_x setVariable [QGVAR(forceMove), nil];
_x setUnitPos "AUTO";
[_x] allowGetIn true;
- } foreach (units _group);
+ } forEach (units _group);
};
},
[_group, speedMode _unit, formation _unit],
@@ -81,7 +81,7 @@ if (_overwatch isEqualTo []) then {
_overwatch = _overwatch select {!(surfaceIsWater (_x select 1))};
_overwatch sort true;
_overwatch = _overwatch apply {_x select 1};
- if (_overwatch isEqualTo []) then {_overwatch pushBack ([ASLtoAGL (getPosASL _unit), _distance2D, 100, 8, _target] call EFUNC(main,findOverwatch));};
+ if (_overwatch isEqualTo []) then {_overwatch pushBack ([ASLToAGL (getPosASL _unit), _distance2D, 100, 8, _target] call EFUNC(main,findOverwatch));};
_overwatch = _overwatch select 0;
};
@@ -111,7 +111,7 @@ _group setFormation "FILE";
{
_x setUnitPos "DOWN";
_x setVariable [QGVAR(forceMove), true];
-} foreach (_units select {isNull objectParent _x});
+} forEach (_units select {isNull objectParent _x});
// leader smoke ~ deploy concealment to enable movement
if (!GVAR(disableAutonomousSmokeGrenades)) then {[_unit, _overwatch] call EFUNC(main,doSmoke);};
@@ -124,7 +124,7 @@ if (EGVAR(main,debug_functions)) then {
["%1 TACTICS FLANK (%2 with %3 units and %6 vehicles @ %4m with %5 positions)", side _unit, name _unit, count _units, round (_unit distance2D _overwatch), count _pos, count _vehicles] call EFUNC(main,debugLog);
private _m = [_unit, "tactics flank", _unit call EFUNC(main,debugMarkerColor), "hd_arrow"] call EFUNC(main,dotMarker);
private _mt = [_overwatch, "", _unit call EFUNC(main,debugMarkerColor), "hd_objective"] call EFUNC(main,dotMarker);
- {_x setMarkerSizeLocal [0.6, 0.6];} foreach [_m, _mt];
+ {_x setMarkerSizeLocal [0.6, 0.6];} forEach [_m, _mt];
_m setMarkerDirLocal (_unit getDir _overwatch);
[{{deleteMarker _x;true} count _this;}, [_m, _mt], _delay + 30] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/danger/functions/fnc_tacticsGarrison.sqf b/addons/danger/functions/fnc_tacticsGarrison.sqf
index d2b91291..c8e07a3f 100644
--- a/addons/danger/functions/fnc_tacticsGarrison.sqf
+++ b/addons/danger/functions/fnc_tacticsGarrison.sqf
@@ -66,7 +66,7 @@ _buildings = _buildings apply { _x select 1 };
// failsafe
if (_buildings isEqualTo []) exitWith {
- {_x doFollow leader _x} foreach _units;
+ {_x doFollow leader _x} forEach _units;
};
// update target ~ better both for debugging and stacking soldiers
diff --git a/addons/danger/functions/fnc_tacticsHide.sqf b/addons/danger/functions/fnc_tacticsHide.sqf
index 9ce31eb0..86d06267 100644
--- a/addons/danger/functions/fnc_tacticsHide.sqf
+++ b/addons/danger/functions/fnc_tacticsHide.sqf
@@ -45,7 +45,7 @@ _target = _target call CBA_fnc_getPos;
_group setCombatMode _combatMode;
_group enableAttack _enableAttack;
_group setFormation _formation;
- {_x doFollow (leader _x)} foreach units _group;
+ {_x doFollow (leader _x)} forEach units _group;
};
},
[_group, combatMode _group, attackEnabled _group, formation _group],
diff --git a/addons/danger/functions/fnc_tacticsReinforce.sqf b/addons/danger/functions/fnc_tacticsReinforce.sqf
index 81b8e4c3..b42b8ccb 100644
--- a/addons/danger/functions/fnc_tacticsReinforce.sqf
+++ b/addons/danger/functions/fnc_tacticsReinforce.sqf
@@ -136,7 +136,7 @@ if (_distance > 500) then {
// pack & deploy static weapons
if !(GVAR(disableAIDeployStaticWeapons)) then {
- private _intersect = terrainIntersectASL [eyePos _unit, AGLtoASL (_target vectorAdd [0, 0, 10])];
+ private _intersect = terrainIntersectASL [eyePos _unit, AGLToASL (_target vectorAdd [0, 0, 10])];
if (_distance > 400 || {_intersect}) then {
_units = [leader _group] call EFUNC(main,doGroupStaticPack);
};
diff --git a/addons/danger/functions/fnc_tacticsSuppress.sqf b/addons/danger/functions/fnc_tacticsSuppress.sqf
index 6bd8265e..f512697f 100644
--- a/addons/danger/functions/fnc_tacticsSuppress.sqf
+++ b/addons/danger/functions/fnc_tacticsSuppress.sqf
@@ -98,7 +98,7 @@ if (EGVAR(main,debug_functions)) then {
["%1 TACTICS SUPPRESS (%2 with %3 units and %6 vehicles @ %4m with %5 positions for %7 cycles)", side _unit, name _unit, count _units, round (_unit distance2D _target), count _pos, count _vehicles, _cycle] call EFUNC(main,debugLog);
private _m = [_unit, "tactics suppress", _unit call EFUNC(main,debugMarkerColor), "hd_arrow"] call EFUNC(main,dotMarker);
private _mt = [_target, "", _unit call EFUNC(main,debugMarkerColor), "hd_destroy"] call EFUNC(main,dotMarker);
- {_x setMarkerSizeLocal [0.6, 0.6];} foreach [_m, _mt];
+ {_x setMarkerSizeLocal [0.6, 0.6];} forEach [_m, _mt];
_m setMarkerDirLocal (_unit getDir _target);
[{{deleteMarker _x;true} count _this;}, [_m, _mt], _delay + 30] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/XEH_postInit.sqf b/addons/main/XEH_postInit.sqf
index 4da87308..dd047117 100644
--- a/addons/main/XEH_postInit.sqf
+++ b/addons/main/XEH_postInit.sqf
@@ -25,7 +25,7 @@ GVAR(CalloutCacheNamespace) = call CBA_fnc_createNamespace;
} forEach _controls;
};
uiNamespace setVariable [_x, []];
-} foreach [
+} forEach [
QGVAR(debug_drawRectCacheGame),
QGVAR(debug_drawRectCacheEGSpectator),
QGVAR(debug_drawRectCacheCurator)
@@ -41,7 +41,7 @@ GVAR(debug_sideColorLUT) = createHashMap;
private _b = profileNamespace getVariable [format ["map_%1_b", _name], _default select 2];
private _color = [_r, _g, _b] call BIS_fnc_colorRGBToHTML;
GVAR(debug_sideColorLUT) set [_side, _color];
-} foreach [
+} forEach [
["blufor", west, [0, 0.3, 0.6]],
["opfor", east, [0.5,0,0]],
["independent", independent, [0,0.5,0]],
diff --git a/addons/main/XEH_preInit.sqf b/addons/main/XEH_preInit.sqf
index 1d7e3be6..4fa340f0 100644
--- a/addons/main/XEH_preInit.sqf
+++ b/addons/main/XEH_preInit.sqf
@@ -5,7 +5,7 @@ ADDON = false;
GVAR(ChooseDialogSettingsCache) = false call CBA_fnc_createNamespace;
// check for WP module
-GVAR(Loaded_WP) = isClass (configfile >> "CfgPatches" >> "lambs_wp");
+GVAR(Loaded_WP) = isClass (configFile >> "CfgPatches" >> "lambs_wp");
GVAR(shareHandlers) = [];
@@ -20,12 +20,12 @@ if (isServer) then {
if (!isNil QGVAR(versionLoadedOnServer) && {GVAR(versionLoadedOnServer) isEqualTo QUOTE(VERSION_STR)}) exitWith {};
private _error = if (isNil QGVAR(versionloadedonServer)) then {
- "LAMBS DANGER NOT LOADED ON SERVER!" hintC parsetext format [
+ "LAMBS DANGER NOT LOADED ON SERVER!" hintC parseText format [
"Lambs Danger is not loaded on server but on Client!"
];
"Lambs Danger is not loaded on server but on Client!"
} else {
- "LAMBS DANGER VERSION MISMATCH ERROR!!!!" hintC parsetext format [
+ "LAMBS DANGER VERSION MISMATCH ERROR!!!!" hintC parseText format [
"Lambs Danger Version mismatch Error.
Client Version: %1
Server Version: %2",
QUOTE(VERSION_str),
GVAR(versionloadedonServer)
diff --git a/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf b/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
index d54226c2..a28715a9 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
@@ -26,7 +26,7 @@ if (_units isEqualTo [] || {_pos isEqualTo []}) exitWith {
_x setVariable [QEGVAR(danger,forceMove), nil];
_x doFollow (leader _x);
_x forceSpeed -1;
- } foreach _units;
+ } forEach _units;
false
};
@@ -58,7 +58,7 @@ private _targetPos = _pos select 0;
// remove positions
_pos = _pos select {[objNull, "VIEW", objNull] checkVisibility [eyePos _unit, (AGLToASL _x) vectorAdd [0, 0, 0.5]] < 0.01};
-} foreach _units;
+} forEach _units;
// remove positions
_pos = _pos select {(_units select 0) distance _x > 3};
diff --git a/addons/main/functions/GroupAction/fnc_doGroupFlank.sqf b/addons/main/functions/GroupAction/fnc_doGroupFlank.sqf
index 802a92e0..12accab1 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupFlank.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupFlank.sqf
@@ -34,14 +34,14 @@ _vehicles = _vehicles select { canFire _x };
_x setVariable [QEGVAR(danger,forceMove), !_suppressed];
// suppress
- private _posASL = AGLtoASL (selectRandom _pos);
+ private _posASL = AGLToASL (selectRandom _pos);
if (
(_forEachIndex % 2) isEqualTo _teamAlpha
&& {!(terrainIntersectASL [eyePos _x, _posASL vectorAdd [0, 0, 3]])}
) then {
[{_this call FUNC(doSuppress)}, [_x, _posASL vectorAdd [0, 0, random 1], true], 1 + random 3] call CBA_fnc_waitAndExecute;
};
-} foreach _units;
+} forEach _units;
// reset alpha status
_teamAlpha = parseNumber (_teamAlpha isEqualTo 0);
@@ -52,11 +52,11 @@ if ((_cycle % 2) isEqualTo 0) then {
private _posAGL = selectRandom _pos;
_x doWatch _posAGL;
[_x, _posAGL] call FUNC(doVehicleSuppress);
- } foreach _vehicles;
+ } forEach _vehicles;
} else {
// check for roads
private _roads = _overwatch nearRoads 50;
- if (_roads isNotEqualTo []) exitWith {_vehicles doMove (ASLtoAGL (getPosASL (selectRandom _roads)));};
+ if (_roads isNotEqualTo []) exitWith {_vehicles doMove (ASLToAGL (getPosASL (selectRandom _roads)));};
_vehicles doMove _overwatch;
};
diff --git a/addons/main/functions/GroupAction/fnc_doGroupHide.sqf b/addons/main/functions/GroupAction/fnc_doGroupHide.sqf
index 9cb18e48..eb5bb0d6 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupHide.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupHide.sqf
@@ -50,7 +50,7 @@ if (_units isEqualTo []) exitWith {false};
[[_unit, _pos, nil, _buildings], _action],
1 + random 2
] call CBA_fnc_waitAndExecute;
-} foreach _units;
+} forEach _units;
// end
true
diff --git a/addons/main/functions/GroupAction/fnc_doGroupStaticDeploy.sqf b/addons/main/functions/GroupAction/fnc_doGroupStaticDeploy.sqf
index ee10b795..3036384f 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupStaticDeploy.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupStaticDeploy.sqf
@@ -52,7 +52,7 @@ private _assistantIndex = _units findIf {
// define assistant
if (_assistantIndex isEqualTo -1) exitWith {
- _units pushback _gunner;
+ _units pushBack _gunner;
_units
};
private _assistant = _units deleteAt _assistantIndex;
@@ -98,7 +98,7 @@ if (_weaponPos isEqualTo []) then {
_x setVariable [QGVAR(currentTarget), _weaponPos, GVAR(debug_functions)];
_x doMove _weaponPos;
_x setDestination [_weaponPos, "LEADER DIRECT", true];
-} foreach [_gunner, _assistant];
+} forEach [_gunner, _assistant];
// do it
[
@@ -145,7 +145,7 @@ if (_weaponPos isEqualTo []) then {
// reset fsm
{
_x setVariable [QEGVAR(danger,forceMove), nil];
- } foreach [_gunner, _assistant];
+ } forEach [_gunner, _assistant];
},
[_gunner, _assistant, _pos, _weaponPos, _EH], 12,
{
@@ -154,7 +154,7 @@ if (_weaponPos isEqualTo []) then {
{
[_x] doFollow (leader _x);
_x setVariable [QEGVAR(danger,forceMove), nil];
- } foreach [_gunner, _assistant];
+ } forEach [_gunner, _assistant];
_gunner removeEventHandler ["WeaponAssembled", _EH];
}
] call CBA_fnc_waitUntilAndExecute;
diff --git a/addons/main/functions/GroupAction/fnc_doGroupStaticFind.sqf b/addons/main/functions/GroupAction/fnc_doGroupStaticFind.sqf
index 4c35cfa9..348494cd 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupStaticFind.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupStaticFind.sqf
@@ -46,7 +46,7 @@ if !((_weapons isEqualTo []) || (_units isEqualTo [])) then { // De Morgan's law
private _unit = _units select 0;
// asign no target
- _unit doWatch ObjNull;
+ _unit doWatch objNull;
// order to man the vehicle
_unit assignAsGunner _weapons;
diff --git a/addons/main/functions/GroupAction/fnc_doGroupStaticPack.sqf b/addons/main/functions/GroupAction/fnc_doGroupStaticPack.sqf
index 2e0d1815..4f48d4e0 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupStaticPack.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupStaticPack.sqf
@@ -79,7 +79,7 @@ _assistant setUnitPosWeak "MIDDLE";
_assistant forceSpeed 24;
_assistant setVariable [QEGVAR(danger,forceMove), true];
_assistant setVariable [QGVAR(currentTask), "Pack Static Weapon", GVAR(debug_functions)];
-_assistant setVariable [QGVAR(currentTarget), ASLtoAGL (getPosASL _gunner), GVAR(debug_functions)];
+_assistant setVariable [QGVAR(currentTarget), ASLToAGL (getPosASL _gunner), GVAR(debug_functions)];
_assistant doMove getPosATL (vehicle _gunner);
// do it
diff --git a/addons/main/functions/GroupAction/fnc_doGroupSuppress.sqf b/addons/main/functions/GroupAction/fnc_doGroupSuppress.sqf
index edac4c6b..a33f7f4a 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupSuppress.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupSuppress.sqf
@@ -32,7 +32,7 @@ _vehicles = _vehicles select { canFire _x };
// suppressive fire
_x forceSpeed 1;
_x setUnitPosWeak "MIDDLE";
- private _suppress = [_x, AGLtoASL _posAGL] call FUNC(doSuppress);
+ private _suppress = [_x, AGLToASL _posAGL] call FUNC(doSuppress);
_x setVariable [QGVAR(currentTask), "Group Suppress", GVAR(debug_functions)];
// no LOS
@@ -51,17 +51,17 @@ _vehicles = _vehicles select { canFire _x };
[_unit, _posASL vectorAdd [2 - random 4, 2 - random 4, 0.8], true] call EFUNC(main,doSuppress);
};
},
- [_x, AGLtoASL _posAGL],
+ [_x, AGLToASL _posAGL],
5
] call CBA_fnc_waitAndExecute;
-} foreach _units;
+} forEach _units;
// vehicles
{
private _posAGL = selectRandom _pos;
_x doWatch _posAGL;
[_x, _posAGL] call FUNC(doVehicleSuppress);
-} foreach _vehicles;
+} forEach _vehicles;
// recursive cyclic
if !(_cycle <= 1 || {_units isEqualTo []}) then {
diff --git a/addons/main/functions/UnitAction/fnc_doAssault.sqf b/addons/main/functions/UnitAction/fnc_doAssault.sqf
index 1c474ca3..64108fc0 100644
--- a/addons/main/functions/UnitAction/fnc_doAssault.sqf
+++ b/addons/main/functions/UnitAction/fnc_doAssault.sqf
@@ -90,7 +90,7 @@ if (GVAR(debug_functions)) then {
name _unit,
round (_unit distance _pos)
] call FUNC(debugLog);
- private _sphere = createSimpleObject ["Sign_Sphere10cm_F", AGLtoASL _pos, true];
+ private _sphere = createSimpleObject ["Sign_Sphere10cm_F", AGLToASL _pos, true];
_sphere setObjectTexture [0, [_unit] call FUNC(debugObjectColor)];
[{deleteVehicle _this}, _sphere, 12] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/functions/UnitAction/fnc_doAssaultCQB.sqf b/addons/main/functions/UnitAction/fnc_doAssaultCQB.sqf
index 389ea079..a04060cd 100644
--- a/addons/main/functions/UnitAction/fnc_doAssaultCQB.sqf
+++ b/addons/main/functions/UnitAction/fnc_doAssaultCQB.sqf
@@ -69,7 +69,7 @@ _unit setDestination [_buildingPosSelected, "FORMATION PLANNED", false];
// debug
if (GVAR(debug_functions)) then {
- private _arrow = createSimpleObject ["Sign_Arrow_Large_F", AGLtoASL _buildingPosSelected, true];
+ private _arrow = createSimpleObject ["Sign_Arrow_Large_F", AGLToASL _buildingPosSelected, true];
_arrow setObjectTexture [0, [_unit] call FUNC(debugObjectColor)];
[{deleteVehicle _this}, _arrow, 20] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/functions/UnitAction/fnc_doAssaultMemory.sqf b/addons/main/functions/UnitAction/fnc_doAssaultMemory.sqf
index 27ca27ac..842beabd 100644
--- a/addons/main/functions/UnitAction/fnc_doAssaultMemory.sqf
+++ b/addons/main/functions/UnitAction/fnc_doAssaultMemory.sqf
@@ -38,7 +38,7 @@ private _nearestEnemy = _unit findNearestEnemy _unit;
if (
(_unit distanceSqr _nearestEnemy < 5041)
&& {(vehicle _nearestEnemy) isKindOf "CAManBase"}
- && {[objNull, "VIEW", objNull] checkVisibility [eyePos _unit, aimPos _nearestEnemy] isEqualTo 1 || {_unit distanceSqr _nearestEnemy < 64 && {(round (getposATL _unit select 2)) isEqualTo (round ((getPosATL _nearestEnemy) select 2))}}}
+ && {[objNull, "VIEW", objNull] checkVisibility [eyePos _unit, aimPos _nearestEnemy] isEqualTo 1 || {_unit distanceSqr _nearestEnemy < 64 && {(round (getPosATL _unit select 2)) isEqualTo (round ((getPosATL _nearestEnemy) select 2))}}}
) exitWith {
[_unit, _nearestEnemy, 12, true] call FUNC(doAssault);
};
@@ -91,7 +91,7 @@ _group setVariable [QGVAR(groupMemory), _groupMemory, false];
// debug
if (GVAR(debug_functions)) then {
["%1 assaulting (sympathetic) (%2 @ %3m - %4 spots)", side _unit, name _unit, round (_unit distance _pos), count _groupMemory] call FUNC(debugLog);
- private _sphere = createSimpleObject ["Sign_Arrow_F", AGLtoASL _pos, true];
+ private _sphere = createSimpleObject ["Sign_Arrow_F", AGLToASL _pos, true];
_sphere setObjectTexture [0, [_unit] call FUNC(debugObjectColor)];
[{deleteVehicle _this}, _sphere, 12] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/functions/UnitAction/fnc_doPanic.sqf b/addons/main/functions/UnitAction/fnc_doPanic.sqf
index 6746b43a..ce081026 100644
--- a/addons/main/functions/UnitAction/fnc_doPanic.sqf
+++ b/addons/main/functions/UnitAction/fnc_doPanic.sqf
@@ -14,7 +14,7 @@
*
* Public: No
*/
-params [["_unit", ObjNull, [ObjNull]]];
+params [["_unit", objNull, [objNull]]];
// exit if unit is dead or otherwis captured
if (
diff --git a/addons/main/functions/UnitAction/fnc_doReposition.sqf b/addons/main/functions/UnitAction/fnc_doReposition.sqf
index 74ed10cc..47d6f949 100644
--- a/addons/main/functions/UnitAction/fnc_doReposition.sqf
+++ b/addons/main/functions/UnitAction/fnc_doReposition.sqf
@@ -15,7 +15,7 @@
*
* Public: No
*/
-params ["_unit", ["_target", ObjNull, [objNull, []]]];
+params ["_unit", ["_target", objNull, [objNull, []]]];
// enemy
if (!(_target isEqualType []) && {isNull _target}) then {
diff --git a/addons/main/functions/UnitAction/fnc_doUGL.sqf b/addons/main/functions/UnitAction/fnc_doUGL.sqf
index 8be7dc3f..32582724 100644
--- a/addons/main/functions/UnitAction/fnc_doUGL.sqf
+++ b/addons/main/functions/UnitAction/fnc_doUGL.sqf
@@ -36,18 +36,18 @@ private _unit = _units findIf {
if (_weapon isNotEqualTo "") then {
- _muzzle = (getArray (configfile >> "CfgWeapons" >> _weapon >> "muzzles") - ["SAFE", "this"]) param [0, ""];
+ _muzzle = (getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles") - ["SAFE", "this"]) param [0, ""];
// find flares
if (_muzzle isNotEqualTo "") then {
- private _findFlares = getArray (configfile >> "CfgWeapons" >> _weapon >> _muzzle >> "magazines");
+ private _findFlares = getArray (configFile >> "CfgWeapons" >> _weapon >> _muzzle >> "magazines");
_findFlares = _findFlares arrayIntersect (magazines _x);
if (_findFlares isEqualTo []) exitWith {false};
// sort flares
private _index = _findFlares findIf {
- private _ammo = getText (configfile >> "CfgMagazines" >> _x >> "Ammo");
- private _flareSimulation = getText (configfile >> "CfgAmmo" >> _ammo >> "simulation");
+ private _ammo = getText (configFile >> "CfgMagazines" >> _x >> "Ammo");
+ private _flareSimulation = getText (configFile >> "CfgAmmo" >> _ammo >> "simulation");
(_flareSimulation find _type) isNotEqualTo -1
};
diff --git a/addons/main/functions/VehicleAction/fnc_doVehicleAssault.sqf b/addons/main/functions/VehicleAction/fnc_doVehicleAssault.sqf
index 44c4d267..be681e41 100644
--- a/addons/main/functions/VehicleAction/fnc_doVehicleAssault.sqf
+++ b/addons/main/functions/VehicleAction/fnc_doVehicleAssault.sqf
@@ -35,7 +35,7 @@ private _predictedPos = _unit getHideFrom _target;
if (_predictedPos isEqualTo [0, 0, 0]) exitWith {false};
// define buildings
-private _visibility = [objNull, "VIEW", _vehicle] checkVisibility [eyePos _vehicle, ATLtoASL (_predictedPos vectorAdd [0, 0, 1.5])];
+private _visibility = [objNull, "VIEW", _vehicle] checkVisibility [eyePos _vehicle, ATLToASL (_predictedPos vectorAdd [0, 0, 1.5])];
if (_buildings isEqualTo [] && {_visibility < 0.5}) then {
_buildings = [_target, 12, false, false] call FUNC(findBuildings);
};
@@ -47,7 +47,7 @@ if (_buildings isNotEqualTo []) then {
// add predicted location -- just to ensure shots fired!
if (_buildings isEqualTo []) then {
- _predictedPos = ASLtoAGL (ATLtoASL _predictedPos);
+ _predictedPos = ASLToAGL (ATLToASL _predictedPos);
if ((_predictedPos select 2) > 6) then {_predictedPos set [2, 0.5]};
_buildings pushBack _predictedPos;
};
@@ -56,7 +56,7 @@ if (_buildings isEqualTo []) then {
_pos = selectRandom _buildings;
// look at position
-_vehicle doWatch (AGLtoASL _pos);
+_vehicle doWatch (AGLToASL _pos);
// suppression
private _suppression = [_unit, _pos] call FUNC(doVehicleSuppress);
@@ -98,7 +98,7 @@ if (GVAR(debug_functions)) then {
private _m = [_unit, "", _unit call FUNC(debugMarkerColor), "mil_arrow2"] call FUNC(dotMarker);
private _mt = [_pos, "", _unit call FUNC(debugMarkerColor),"mil_destroy"] call FUNC(dotMarker);
- {_x setMarkerSizeLocal [0.6, 0.6];} foreach [_m, _mt];
+ {_x setMarkerSizeLocal [0.6, 0.6];} forEach [_m, _mt];
_m setMarkerDirLocal (_unit getDir _target);
[{{deleteMarker _x;true} count _this;}, [_m, _mt], 15] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/functions/VehicleAction/fnc_doVehicleJink.sqf b/addons/main/functions/VehicleAction/fnc_doVehicleJink.sqf
index b676679c..947963d8 100644
--- a/addons/main/functions/VehicleAction/fnc_doVehicleJink.sqf
+++ b/addons/main/functions/VehicleAction/fnc_doVehicleJink.sqf
@@ -60,7 +60,7 @@ _destination = selectRandom _destination;
// check for roads
private _roads = _destination nearRoads (_range * 0.5);
-if (_roads isNotEqualTo []) then {_destination = ASLtoAGL (getPosASL (selectRandom _roads));};
+if (_roads isNotEqualTo []) then {_destination = ASLToAGL (getPosASL (selectRandom _roads));};
// make tanks pop smoke when moving
private _time = _vehicle getVariable [QGVAR(smokescreenTime), 0];
diff --git a/addons/main/functions/VehicleAction/fnc_doVehicleRotate.sqf b/addons/main/functions/VehicleAction/fnc_doVehicleRotate.sqf
index def69989..82dad283 100644
--- a/addons/main/functions/VehicleAction/fnc_doVehicleRotate.sqf
+++ b/addons/main/functions/VehicleAction/fnc_doVehicleRotate.sqf
@@ -32,7 +32,7 @@ if (!canMove _unit || {currentCommand _unit isEqualTo "MOVE"}) exitWith {false};
// CQB tweak -- target within 75m - look instead
if (_unit distanceSqr _target < 5625) exitWith {
- (vehicle _unit) doWatch (ATLtoASL _target);
+ (vehicle _unit) doWatch (ATLToASL _target);
false
};
diff --git a/addons/main/functions/VehicleAction/fnc_doVehicleSuppress.sqf b/addons/main/functions/VehicleAction/fnc_doVehicleSuppress.sqf
index a2032670..d7c6ed58 100644
--- a/addons/main/functions/VehicleAction/fnc_doVehicleSuppress.sqf
+++ b/addons/main/functions/VehicleAction/fnc_doVehicleSuppress.sqf
@@ -25,7 +25,7 @@ if (speed _vehicle > 30 || {(_pos select 2) > 100}) exitWith {false};
// pos
private _eyePos = eyePos _unit;
-_pos = (AGLtoASL _pos) vectorAdd [0.5 - random 1, 0.5 - random 1, 0.3 + random 1.3];
+_pos = (AGLToASL _pos) vectorAdd [0.5 - random 1, 0.5 - random 1, 0.3 + random 1.3];
// target is close or terrain occludes target
if (
diff --git a/addons/main/functions/debug/fnc_debugDraw.sqf b/addons/main/functions/debug/fnc_debugDraw.sqf
index 22e6ddae..23a53a9c 100644
--- a/addons/main/functions/debug/fnc_debugDraw.sqf
+++ b/addons/main/functions/debug/fnc_debugDraw.sqf
@@ -43,10 +43,10 @@ QGVAR(debug_drawRectCacheGame) call _fnc_clearControls;
QGVAR(debug_drawRectCacheCurator) call _fnc_clearControls;
QGVAR(debug_drawRectCacheEGSpectator) call _fnc_clearControls;
-private _gameCache = uiNamespace getvariable [QGVAR(debug_drawRectCacheGame), []];
+private _gameCache = uiNamespace getVariable [QGVAR(debug_drawRectCacheGame), []];
private _gameInUse = [];
-private _curatorCache = uiNamespace getvariable [QGVAR(debug_drawRectCacheCurator), []];
+private _curatorCache = uiNamespace getVariable [QGVAR(debug_drawRectCacheCurator), []];
private _curatorInUse = [];
private _spectatorCache = uiNamespace getVariable [QGVAR(debug_drawRectCacheEGSpectator), []];
@@ -69,7 +69,7 @@ private _fnc_getRect = {
} else {
_control = _curatorCache deleteAt 0;
};
- _curatorInUse pushback _control;
+ _curatorInUse pushBack _control;
_control
};
if (!isNull _displayEGSpectator) exitWith {
@@ -79,7 +79,7 @@ private _fnc_getRect = {
} else {
_control = _spectatorCache deleteAt 0;
};
- _spectatorInUse pushback _control;
+ _spectatorInUse pushBack _control;
_control
};
if (_gameCache isEqualTo []) then {
@@ -88,7 +88,7 @@ private _fnc_getRect = {
} else {
_control = _gameCache deleteAt 0;
};
- _gameInUse pushback _control;
+ _gameInUse pushBack _control;
_control
};
@@ -97,7 +97,7 @@ private _fnc_debug_drawRect = {
private _pos2D = worldToScreen _pos;
if (_pos2D isEqualTo []) exitWith {};
private _control = call _fnc_getRect;
- _textData pushback "";
+ _textData pushBack "";
private _text = "";
{
@@ -144,7 +144,7 @@ private _posCam = positionCameraToWorld [0, 0, 0];
private _unitIsLocal = local _unit;
if (_unitIsLocal || !getRemoteSensorsDisabled) then {
private _knowledge = _unit targetKnowledge _currentTarget;
- private _knowledgePosition = ASLtoAGL(_knowledge select 6);
+ private _knowledgePosition = ASLToAGL(_knowledge select 6);
private _knowledgeAge = _knowledge select 2;
if (_knowledgeAge == time && _unitIsLocal) then {
_unit setVariable [QGVAR(debug_LastSeenPos), _knowledgePosition, GVAR(debug_functions)];
diff --git a/addons/main/functions/debug/fnc_debugMarkerColor.sqf b/addons/main/functions/debug/fnc_debugMarkerColor.sqf
index 33f237a3..ddfbf31a 100644
--- a/addons/main/functions/debug/fnc_debugMarkerColor.sqf
+++ b/addons/main/functions/debug/fnc_debugMarkerColor.sqf
@@ -17,8 +17,8 @@
params ["_unit"];
// return
-if (side _unit isEqualTo EAST) exitWith { "colorEAST" };
-if (side _unit isEqualTo WEST) exitWith { "colorWEST" };
-if (side _unit isEqualTo CIVILIAN) exitWith { "ColorCIV" };
-if (side _unit isEqualTo INDEPENDENT) exitWith { "colorIndependent" };
+if (side _unit isEqualTo east) exitWith { "colorEAST" };
+if (side _unit isEqualTo west) exitWith { "colorWEST" };
+if (side _unit isEqualTo civilian) exitWith { "ColorCIV" };
+if (side _unit isEqualTo independent) exitWith { "colorIndependent" };
"ColorUNKNOWN"
diff --git a/addons/main/functions/debug/fnc_debugObjectColor.sqf b/addons/main/functions/debug/fnc_debugObjectColor.sqf
index c26acb61..55e50720 100644
--- a/addons/main/functions/debug/fnc_debugObjectColor.sqf
+++ b/addons/main/functions/debug/fnc_debugObjectColor.sqf
@@ -17,8 +17,8 @@
params ["_unit"];
// return
-if (side _unit isEqualTo EAST) exitWith { "#(argb,8,8,3)color(0.5,0,0,0.7,ca)" };
-if (side _unit isEqualTo WEST) exitWith { "#(argb,8,8,3)color(0,0.3,0.6,0.7,ca)" };
-if (side _unit isEqualTo CIVILIAN) exitWith { "#(argb,8,8,3)color(0.4,0,0.5,0.7,ca)" };
-if (side _unit isEqualTo INDEPENDENT) exitWith { "#(argb,8,8,3)color(0,0.5,0,0.7,ca)" };
+if (side _unit isEqualTo east) exitWith { "#(argb,8,8,3)color(0.5,0,0,0.7,ca)" };
+if (side _unit isEqualTo west) exitWith { "#(argb,8,8,3)color(0,0.3,0.6,0.7,ca)" };
+if (side _unit isEqualTo civilian) exitWith { "#(argb,8,8,3)color(0.4,0,0.5,0.7,ca)" };
+if (side _unit isEqualTo independent) exitWith { "#(argb,8,8,3)color(0,0.5,0,0.7,ca)" };
"#(argb,8,8,3)color(0.7,0.6,0,0.7,ca)"
diff --git a/addons/main/functions/debug/fnc_zoneMarker.sqf b/addons/main/functions/debug/fnc_zoneMarker.sqf
index b93df3e6..483c9f46 100644
--- a/addons/main/functions/debug/fnc_zoneMarker.sqf
+++ b/addons/main/functions/debug/fnc_zoneMarker.sqf
@@ -37,7 +37,7 @@ params ["_pos", ["_size", [100, 100]], ["_color", "colorEAST"], ["_brush", "FDia
_pos = _pos call CBA_fnc_getPos;
// create
-private _m = createMarkerLocal [format["mzone_%1%2%3", (floor(_pos select 0)), (floor(_pos select 1)), count allmapMarkers], _pos];
+private _m = createMarkerLocal [format["mzone_%1%2%3", (floor(_pos select 0)), (floor(_pos select 1)), count allMapMarkers], _pos];
_m setMarkerShapeLocal "ELLIPSE";
_m setMarkerColorLocal _color;
_m setMarkerBrushLocal _brush;
diff --git a/addons/main/functions/fnc_checkMagazineAiUsageFlags.sqf b/addons/main/functions/fnc_checkMagazineAiUsageFlags.sqf
index 0a82cc79..6bb18e00 100644
--- a/addons/main/functions/fnc_checkMagazineAiUsageFlags.sqf
+++ b/addons/main/functions/fnc_checkMagazineAiUsageFlags.sqf
@@ -24,7 +24,7 @@ params [["_magazine", "", [""]], ["_flags", 0, [0]]];
GVAR(aiUsageFlagCache) getOrDefaultCall [_magazine + str _flags,{
// find smoke shell
- private _ammo = getText (configfile >> "CfgMagazines" >> _magazine >> "Ammo");
- private _aiAmmoUsage = getNumber (configfile >> "CfgAmmo" >> _ammo >> "aiAmmoUsageFlags");
+ private _ammo = getText (configFile >> "CfgMagazines" >> _magazine >> "Ammo");
+ private _aiAmmoUsage = getNumber (configFile >> "CfgAmmo" >> _ammo >> "aiAmmoUsageFlags");
[_aiAmmoUsage, _flags] call BIS_fnc_bitflagsCheck;
}, true];
diff --git a/addons/main/functions/fnc_doShareInformation.sqf b/addons/main/functions/fnc_doShareInformation.sqf
index 44a4ae1d..113d3c04 100644
--- a/addons/main/functions/fnc_doShareInformation.sqf
+++ b/addons/main/functions/fnc_doShareInformation.sqf
@@ -96,7 +96,7 @@ if (EGVAR(main,debug_functions)) then {
_m setMarkerDirLocal (getDir _x);
_m setMarkerTextLocal str (_unit knowsAbout _x);
_markers pushBack _m;
- } foreach ((units _target) select {_unit knowsAbout _x > 0});
+ } forEach ((units _target) select {_unit knowsAbout _x > 0});
// friendly units
{
@@ -104,7 +104,7 @@ if (EGVAR(main,debug_functions)) then {
_m setMarkerSizeLocal [0.5, 0.5];
_m setMarkerDirLocal (getDir _x);
_markers pushBack _m;
- } foreach units _unit;
+ } forEach units _unit;
[{{deleteMarker _x;true} count _this;}, _markers, 60] call CBA_fnc_waitAndExecute;
};
diff --git a/addons/main/functions/fnc_findCover.sqf b/addons/main/functions/fnc_findCover.sqf
index 67d90481..85a9fd24 100644
--- a/addons/main/functions/fnc_findCover.sqf
+++ b/addons/main/functions/fnc_findCover.sqf
@@ -82,7 +82,7 @@ if (_dangerPos isNotEqualTo [0, 0, 1.8]) then {
_stances pushBack "UP";
};
};
- _ret pushback [_pos, selectRandom _stances];
+ _ret pushBack [_pos, selectRandom _stances];
_numFound = _numFound + 1;
_found = ((_maxResults isNotEqualTo -1) && {_numFound isEqualTo _maxResults});
diff --git a/addons/main/functions/fnc_findOverwatch.sqf b/addons/main/functions/fnc_findOverwatch.sqf
index 42438b9b..444cf983 100644
--- a/addons/main/functions/fnc_findOverwatch.sqf
+++ b/addons/main/functions/fnc_findOverwatch.sqf
@@ -63,7 +63,7 @@ for "_i" from 0 to 300 do {
if ((_height > _minHeight) && _distCheck) then {
if !(_terrainBlocked) then {
- _selectedPositions pushback _checkPos;
+ _selectedPositions pushBack _checkPos;
};
};
if (count _selectedPositions >= 5) then {
diff --git a/addons/main/functions/fnc_findReadyUnits.sqf b/addons/main/functions/fnc_findReadyUnits.sqf
index 559475ca..9f4b5586 100644
--- a/addons/main/functions/fnc_findReadyUnits.sqf
+++ b/addons/main/functions/fnc_findReadyUnits.sqf
@@ -44,6 +44,6 @@ _units = _units select {
{
_x setUnitCombatMode "BLUE";
_x setUnitCombatMode "YELLOW";
-} foreach (_units select {currentCommand _x isEqualTo "ATTACK"});
+} forEach (_units select {currentCommand _x isEqualTo "ATTACK"});
_units
diff --git a/addons/main/functions/fnc_getShareInformationParams.sqf b/addons/main/functions/fnc_getShareInformationParams.sqf
index 0acd584d..df6ec8dd 100644
--- a/addons/main/functions/fnc_getShareInformationParams.sqf
+++ b/addons/main/functions/fnc_getShareInformationParams.sqf
@@ -24,8 +24,8 @@ if (_override) exitWith { [_unit, _range, _radio] };
// get range by faction
_range = switch (side _unit) do {
- case WEST: { GVAR(radioWest) };
- case EAST: { GVAR(radioEast) };
+ case west: { GVAR(radioWest) };
+ case east: { GVAR(radioEast) };
default { GVAR(radioGuer) };
};
diff --git a/addons/main/functions/fnc_parseData.sqf b/addons/main/functions/fnc_parseData.sqf
index d08f2c0a..a484b02e 100644
--- a/addons/main/functions/fnc_parseData.sqf
+++ b/addons/main/functions/fnc_parseData.sqf
@@ -53,7 +53,7 @@ private _data = [];
};
private _cacheName = _ctrl getVariable [QGVAR(CacheName), ""];
GVAR(ChooseDialogSettingsCache) setVariable [_cacheName, _d];
- _data pushback _d;
+ _data pushBack _d;
} forEach (_element getVariable [QGVAR(ControlData), []]);
_data;
diff --git a/addons/main/functions/fnc_showDialog.sqf b/addons/main/functions/fnc_showDialog.sqf
index a0d81820..87fea7a4 100644
--- a/addons/main/functions/fnc_showDialog.sqf
+++ b/addons/main/functions/fnc_showDialog.sqf
@@ -328,7 +328,7 @@ private _fnc_AddSideSelector = {
_x params ["_side", ["_tooltip", "", [""]]];
private _b = [_tooltip, _side, [_xpos, _basePositionY, PX(CONST_HEIGHT), PY(CONST_HEIGHT)]] call _fnc_CreateButton;
_xpos = _xpos + _xoffset;
- _buttons pushback _b;
+ _buttons pushBack _b;
if (_default == _side) then {
(_buttons select 0) setVariable [QGVAR(SelectedSide), _side];
_b ctrlSetTextColor [1, 1, 1, 1];
@@ -348,7 +348,7 @@ private _controls = [];
switch (_type) do {
case ("BOOLEAN");
case ("BOOL"): {
- _controls pushback [(_x call _fnc_AddBoolean), _type];
+ _controls pushBack [(_x call _fnc_AddBoolean), _type];
};
case ("LISTBOX");
case ("LIST");
@@ -363,7 +363,7 @@ private _controls = [];
case ("INTEGER");
case ("TEXT");
case ("EDIT"): {
- _controls pushback [(_x call _fnc_AddTextField), _type];
+ _controls pushBack [(_x call _fnc_AddTextField), _type];
};
case ("DESCRIPTION"): {
_x call _fnc_DescriptionField; // This Type does not generate any Data and will not be enterted into the return data
@@ -372,7 +372,7 @@ private _controls = [];
_controls pushBack [(_x call _fnc_AddSideSelector), _type];
};
default {
- _controls pushback [(_x call _fnc_AddTextField), _type];
+ _controls pushBack [(_x call _fnc_AddTextField), _type];
hint format ["%1 type unknown %2", _type, _x];
// TYPE NOT FOUND
};
diff --git a/addons/main/settings.inc.sqf b/addons/main/settings.inc.sqf
index 1c486643..f439abe6 100644
--- a/addons/main/settings.inc.sqf
+++ b/addons/main/settings.inc.sqf
@@ -238,7 +238,7 @@ _curCat = LSTRING(Settings_Debug);
} forEach _controls;
};
uiNamespace setVariable [_x, []];
- } foreach [
+ } forEach [
QGVAR(debug_drawRectCacheGame),
QGVAR(debug_drawRectCacheEGSpectator),
QGVAR(debug_drawRectCacheCurator)
diff --git a/addons/wp/functions/fnc_doArtillery.sqf b/addons/wp/functions/fnc_doArtillery.sqf
index 1fd1df78..a09ae55f 100644
--- a/addons/wp/functions/fnc_doArtillery.sqf
+++ b/addons/wp/functions/fnc_doArtillery.sqf
@@ -64,7 +64,7 @@ if !((vehicle _gun) isKindOf "StaticMortar") then {
private _isMLRS = _gun getVariable [QEGVAR(main,isArtilleryMRLS), false];
if (_isMLRS) then {
_skipCheckrounds = true;
- _salvo = (gunner _gun) Ammo (currentMuzzle (gunner _gun));
+ _salvo = (gunner _gun) ammo (currentMuzzle (gunner _gun));
_rounds = 1;
if ((_salvo mod 6) isEqualTo 0) then {
_rounds = floor (_salvo * 0.334);
@@ -121,7 +121,7 @@ if (canFire _gun && {(_caller call EFUNC(main,isAlive))}) then {
// debug
if (EGVAR(main,debug_functions)) then {
- private _marker = [_target, ["%1 %2 (check round barrage %3)", getText (configOf _gun >> "displayName"), groupID (group _gun), _check], "Color4_FD_F", "mil_destroy"] call EFUNC(main,dotMarker);
+ private _marker = [_target, ["%1 %2 (check round barrage %3)", getText (configOf _gun >> "displayName"), groupId (group _gun), _check], "Color4_FD_F", "mil_destroy"] call EFUNC(main,dotMarker);
_markerList pushBack _marker;
};
@@ -163,7 +163,7 @@ if (canFire _gun && {(_caller call EFUNC(main,isAlive))}) then {
// debug
if (EGVAR(main,debug_functions)) then {
- private _marker = [_target, ["%1 %2 (main salvo %3)", getText (configOf _gun >> "displayName"), groupID (group _gun), _i], "Color5_FD_F", "mil_destroy"] call EFUNC(main,dotMarker);
+ private _marker = [_target, ["%1 %2 (main salvo %3)", getText (configOf _gun >> "displayName"), groupId (group _gun), _i], "Color5_FD_F", "mil_destroy"] call EFUNC(main,dotMarker);
_markerList pushBack _marker;
};
diff --git a/addons/wp/functions/fnc_doAssaultUnitReset.sqf b/addons/wp/functions/fnc_doAssaultUnitReset.sqf
index 88f0269d..0b6e908c 100644
--- a/addons/wp/functions/fnc_doAssaultUnitReset.sqf
+++ b/addons/wp/functions/fnc_doAssaultUnitReset.sqf
@@ -39,7 +39,7 @@ if (!_retreat && {animationState _unit in ["apanpknlmsprsnonwnondf", "apanpercms
if (_retreat) then {
_unit switchMove (["AmovPercMsprSlowWrflDf_AmovPpneMstpSrasWrflDnon", "AmovPercMsprSnonWnonDf_AmovPpneMstpSnonWnonDnon"] select ((primaryWeapon _unit) isEqualTo ""));
_unit enableAI "AUTOTARGET";
- _unit doWatch ObjNull;
+ _unit doWatch objNull;
};
_unit
diff --git a/addons/wp/functions/fnc_taskArtilleryRegister.sqf b/addons/wp/functions/fnc_taskArtilleryRegister.sqf
index bffba3a6..1a77dea7 100644
--- a/addons/wp/functions/fnc_taskArtilleryRegister.sqf
+++ b/addons/wp/functions/fnc_taskArtilleryRegister.sqf
@@ -59,7 +59,7 @@ if (_artillery isEqualTo []) exitWith {false};
// debug
if (EGVAR(main,debug_functions)) then {
- ["%1 Registered Artillery: %2 registered %3 guns", side _group, groupID _group, count _artillery] call EFUNC(main,debugLog);
+ ["%1 Registered Artillery: %2 registered %3 guns", side _group, groupId _group, count _artillery] call EFUNC(main,debugLog);
};
// end
diff --git a/addons/wp/functions/fnc_taskAssault.sqf b/addons/wp/functions/fnc_taskAssault.sqf
index 5625046d..bfc2fc78 100644
--- a/addons/wp/functions/fnc_taskAssault.sqf
+++ b/addons/wp/functions/fnc_taskAssault.sqf
@@ -150,7 +150,7 @@ _group setFormation "LINE";
] call CBA_fnc_addPerFrameHandler;
_x setVariable [QGVAR(taskAssault), true];
};
-} foreach _units;
+} forEach _units;
// execute move
waitUntil {
diff --git a/addons/wp/functions/fnc_taskCQB.sqf b/addons/wp/functions/fnc_taskCQB.sqf
index fa4a4f4e..8fb9d7fc 100644
--- a/addons/wp/functions/fnc_taskCQB.sqf
+++ b/addons/wp/functions/fnc_taskCQB.sqf
@@ -122,7 +122,7 @@ private _fnc_act = {
// debug
if (EGVAR(main,debug_functions)) then {
- private _arrow = createSimpleObject ["Sign_Arrow_Large_Blue_F", AGLtoASL _buildingPosSelected, true];
+ private _arrow = createSimpleObject ["Sign_Arrow_Large_Blue_F", AGLToASL _buildingPosSelected, true];
_arrow setObjectTexture [0, [_x] call EFUNC(main,debugObjectColor)];
};
@@ -211,7 +211,7 @@ waitUntil {
[_enemy, _group, _building] call _fnc_act;
// debug
- if (EGVAR(main,debug_functions)) then {["%1 taskCQB: (team: %2) (units: %3) (enemies: %4)", side _group, groupID _group, count units _group, !isNull _enemy] call EFUNC(main,debugLog);}; // instead of boolean for enemies, would be better with a count -nkenny
+ if (EGVAR(main,debug_functions)) then {["%1 taskCQB: (team: %2) (units: %3) (enemies: %4)", side _group, groupId _group, count units _group, !isNull _enemy] call EFUNC(main,debugLog);}; // instead of boolean for enemies, would be better with a count -nkenny
// wait
sleep _cycle;
@@ -224,9 +224,9 @@ waitUntil {
// reset
{
_x setVariable [QEGVAR(danger,disableAI), nil];
- _x setUnitpos "AUTO";
+ _x setUnitPos "AUTO";
_x doFollow (leader _x);
-} foreach units _group;
+} forEach units _group;
// debug
if (EGVAR(main,debug_functions)) then {["%1 taskCQB: CQB DONE version 0.3", side _group] call EFUNC(main,debugLog);};
diff --git a/addons/wp/functions/fnc_taskCamp.sqf b/addons/wp/functions/fnc_taskCamp.sqf
index b62f9989..1793595a 100644
--- a/addons/wp/functions/fnc_taskCamp.sqf
+++ b/addons/wp/functions/fnc_taskCamp.sqf
@@ -77,7 +77,7 @@ if (_patrol) then {
};
// id
- _patrolGroup setGroupIDGlobal [format ["Patrol (%1)", groupId _patrolGroup]];
+ _patrolGroup setGroupIdGlobal [format ["Patrol (%1)", groupId _patrolGroup]];
// orders
if (_area isEqualTo []) then {
@@ -254,7 +254,7 @@ _wp2 setWaypointType _wp2Type;
// debug
if (EGVAR(main,debug_functions)) then {
- ["%1 taskCamp: %2 established camp", side _group, groupID _group] call EFUNC(main,debugLog);
+ ["%1 taskCamp: %2 established camp", side _group, groupId _group] call EFUNC(main,debugLog);
};
// end
diff --git a/addons/wp/functions/fnc_taskCreep.sqf b/addons/wp/functions/fnc_taskCreep.sqf
index e982f2f4..93293b19 100644
--- a/addons/wp/functions/fnc_taskCreep.sqf
+++ b/addons/wp/functions/fnc_taskCreep.sqf
@@ -51,7 +51,7 @@ private _fnc_creepOrders = {
if (behaviour (leader _group) isEqualTo "COMBAT") exitWith {
_group setCombatMode "RED";
{
- _x setUnitpos "MIDDLE";
+ _x setUnitPos "MIDDLE";
_x doMove (getPosATL _target);
true
} count (units _group);
@@ -99,7 +99,7 @@ _group setVariable [QEGVAR(main,currentTactic), "taskCreep", EGVAR(main,debug_fu
// failsafe!
{
//doStop _x;
- _x addEventhandler ["FiredNear", {
+ _x addEventHandler ["FiredNear", {
params ["_unit"];
_unit setCombatMode "RED";
(group _unit) enableAttack true;
@@ -121,7 +121,7 @@ waitUntil {
if (!isNull _target) then {
[_group, _target] call _fnc_creepOrders;
if (EGVAR(main,debug_functions)) then {
- ["%1 taskCreep: %2 targets %3 (%4) at %5 Meters -- Stealth %6/%7", side _group, groupID _group, name _target, _group knowsAbout _target, floor (leader _group distance2D _target), ((selectBestPlaces [getPos leader _group, 2, "(forest + trees)*0.5", 1, 1]) select 0) select 1, str(unitPos leader _group)] call EFUNC(main,debugLog);
+ ["%1 taskCreep: %2 targets %3 (%4) at %5 Meters -- Stealth %6/%7", side _group, groupId _group, name _target, _group knowsAbout _target, floor (leader _group distance2D _target), ((selectBestPlaces [getPos leader _group, 2, "(forest + trees)*0.5", 1, 1]) select 0) select 1, str(unitPos leader _group)] call EFUNC(main,debugLog);
};
sleep _cycle;
} else {
diff --git a/addons/wp/functions/fnc_taskGarrison.sqf b/addons/wp/functions/fnc_taskGarrison.sqf
index c758dcc9..7950797d 100644
--- a/addons/wp/functions/fnc_taskGarrison.sqf
+++ b/addons/wp/functions/fnc_taskGarrison.sqf
@@ -104,7 +104,7 @@ if (_patrol) then {
};
// id
- _patrolGroup setGroupIDGlobal [format ["Patrol (%1)", groupId _patrolGroup]];
+ _patrolGroup setGroupIdGlobal [format ["Patrol (%1)", groupId _patrolGroup]];
// orders
if (_area isEqualTo []) then {
@@ -220,7 +220,7 @@ private _fnc_addEventHandler = {
// look away from nearest building
if !([_x] call EFUNC(main,isIndoor)) then {
- _x doWatch AGLtoASL (_x getPos [250, (nearestBuilding _house) getDir _house]);
+ _x doWatch AGLToASL (_x getPos [250, (nearestBuilding _house) getDir _house]);
};
};
} else {
@@ -259,7 +259,7 @@ _wp setWaypointCompletionRadius _radius;
// debug
if (EGVAR(main,debug_functions)) then {
- ["%1 taskGarrison: %2 garrisoned", side _group, groupID _group] call EFUNC(main,debugLog);
+ ["%1 taskGarrison: %2 garrisoned", side _group, groupId _group] call EFUNC(main,debugLog);
};
// end
diff --git a/addons/wp/functions/fnc_taskHunt.sqf b/addons/wp/functions/fnc_taskHunt.sqf
index 0d3f10dd..bbd90c04 100644
--- a/addons/wp/functions/fnc_taskHunt.sqf
+++ b/addons/wp/functions/fnc_taskHunt.sqf
@@ -50,7 +50,7 @@ private _fnc_flare = {
private _units = units _leader;
private _unitsPostUGL = [_units] call EFUNC(main,doUGL);
if (_units isEqualTo _unitsPostUGL) then {
- private _flare = "F_20mm_Red" createVehicle (_leader ModelToWorld [0, 0, 200]);
+ private _flare = "F_20mm_Red" createVehicle (_leader modelToWorld [0, 0, 200]);
_flare setVelocity [0, 0, -10];
};
};
@@ -67,7 +67,7 @@ if (!local _group) exitWith {false};
if (_group isEqualType objNull) then { _group = group _group; };
// orders
-_group setbehaviour "SAFE";
+_group setBehaviour "SAFE";
_group setSpeedMode "LIMITED";
_group enableAttack false;
@@ -101,7 +101,7 @@ waitUntil {
_group enableIRLasers true;
// debug
- if (EGVAR(main,debug_functions)) then {["%1 taskHunt: %2 targets %3 at %4M", side _group, groupID _group, name _target, floor (leader _group distance2D _target)] call EFUNC(main,debugLog);};
+ if (EGVAR(main,debug_functions)) then {["%1 taskHunt: %2 targets %3 at %4M", side _group, groupId _group, name _target, floor (leader _group distance2D _target)] call EFUNC(main,debugLog);};
// flare
if (!_combat && {_onFoot} && {RND(0.8)}) then { [leader _group] call _fnc_flare; };
diff --git a/addons/wp/functions/fnc_taskPatrol.sqf b/addons/wp/functions/fnc_taskPatrol.sqf
index 2813db33..be8e9a18 100644
--- a/addons/wp/functions/fnc_taskPatrol.sqf
+++ b/addons/wp/functions/fnc_taskPatrol.sqf
@@ -120,7 +120,7 @@ if (_moveWaypoints) then {
// debug
if (EGVAR(main,debug_functions)) then {
- ["%1 taskPatrol: %2 Patrols", side _group, groupID _group] call EFUNC(main,debugLog);
+ ["%1 taskPatrol: %2 Patrols", side _group, groupId _group] call EFUNC(main,debugLog);
};
// end
diff --git a/addons/wp/functions/fnc_taskRush.sqf b/addons/wp/functions/fnc_taskRush.sqf
index 29b60ab2..320cae24 100644
--- a/addons/wp/functions/fnc_taskRush.sqf
+++ b/addons/wp/functions/fnc_taskRush.sqf
@@ -133,7 +133,7 @@ waitUntil {
// act
if (!isNull _target) then {
[_group, _target] call _fnc_rushOrders;
- if (EGVAR(main,debug_functions)) then { ["%1 taskRush: %2 targets %3 at %4M", side _group, groupID _group, name _target, floor (leader _group distance2D _target)] call EFUNC(main,debugLog); };
+ if (EGVAR(main,debug_functions)) then { ["%1 taskRush: %2 targets %3 at %4M", side _group, groupId _group, name _target, floor (leader _group distance2D _target)] call EFUNC(main,debugLog); };
sleep (linearConversion [1000, 2000, (leader _group distance2D _target), _cycle, _cycle * 4, true]);
} else {
sleep (_cycle * 4);
diff --git a/addons/wp/scripts/fnc_wpAssault.sqf b/addons/wp/scripts/fnc_wpAssault.sqf
index d5ea9294..1cb764fe 100644
--- a/addons/wp/scripts/fnc_wpAssault.sqf
+++ b/addons/wp/scripts/fnc_wpAssault.sqf
@@ -23,7 +23,7 @@ _group setVariable [QEGVAR(danger,disableGroupAI), true];
{
_x enableAI "MOVE";
_x enableAI "PATH";
-} foreach units _group;
+} forEach units _group;
// low level move order
_group move _pos;
diff --git a/addons/wp/scripts/fnc_wpCQB.sqf b/addons/wp/scripts/fnc_wpCQB.sqf
index 58e17719..3a875e2e 100644
--- a/addons/wp/scripts/fnc_wpCQB.sqf
+++ b/addons/wp/scripts/fnc_wpCQB.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius", 0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_CQB_SIZE; };
// get other settings
diff --git a/addons/wp/scripts/fnc_wpCreep.sqf b/addons/wp/scripts/fnc_wpCreep.sqf
index 2b16cc85..46bde4de 100644
--- a/addons/wp/scripts/fnc_wpCreep.sqf
+++ b/addons/wp/scripts/fnc_wpCreep.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius", 0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_CREEP_SIZE; };
// get other settings
diff --git a/addons/wp/scripts/fnc_wpGarrison.sqf b/addons/wp/scripts/fnc_wpGarrison.sqf
index fbe77c7a..43e7d97d 100644
--- a/addons/wp/scripts/fnc_wpGarrison.sqf
+++ b/addons/wp/scripts/fnc_wpGarrison.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius", 0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_GARRISON_SIZE; };
// get other settings
diff --git a/addons/wp/scripts/fnc_wpHunt.sqf b/addons/wp/scripts/fnc_wpHunt.sqf
index 7d9cb666..726d0173 100644
--- a/addons/wp/scripts/fnc_wpHunt.sqf
+++ b/addons/wp/scripts/fnc_wpHunt.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius", 0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_HUNT_SIZE; };
// get other settings
diff --git a/addons/wp/scripts/fnc_wpPatrol.sqf b/addons/wp/scripts/fnc_wpPatrol.sqf
index 2d091652..c60cde65 100644
--- a/addons/wp/scripts/fnc_wpPatrol.sqf
+++ b/addons/wp/scripts/fnc_wpPatrol.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius", 0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_PATROL_SIZE; };
// get other settings
diff --git a/addons/wp/scripts/fnc_wpRetreat.sqf b/addons/wp/scripts/fnc_wpRetreat.sqf
index 810f8c17..7d76591f 100644
--- a/addons/wp/scripts/fnc_wpRetreat.sqf
+++ b/addons/wp/scripts/fnc_wpRetreat.sqf
@@ -24,7 +24,7 @@ _group setSpeedMode "FULL";
{
_x enableAI "MOVE";
_x enableAI "PATH";
-} foreach units _group;
+} forEach units _group;
// low level move order
_group move _pos;
diff --git a/addons/wp/scripts/fnc_wpRush.sqf b/addons/wp/scripts/fnc_wpRush.sqf
index 73822846..989581a9 100644
--- a/addons/wp/scripts/fnc_wpRush.sqf
+++ b/addons/wp/scripts/fnc_wpRush.sqf
@@ -16,7 +16,7 @@
params ["_group", "_pos", ["_radius",0]];
// get radius
-_radius = waypointCompletionRadius [_group, currentwaypoint _group];
+_radius = waypointCompletionRadius [_group, currentWaypoint _group];
if (_radius isEqualTo 0) then { _radius = TASK_RUSH_SIZE; };
// low level move order
diff --git a/addons/wp/settings.inc.sqf b/addons/wp/settings.inc.sqf
index 7fdb3030..7b93ad20 100644
--- a/addons/wp/settings.inc.sqf
+++ b/addons/wp/settings.inc.sqf
@@ -6,7 +6,7 @@ DFUNC(ArtilleryScan) = {
};
{
_x call FUNC(taskArtilleryRegister);
- } foreach (vehicles select {
+ } forEach (vehicles select {
getNumber (configOf _x >> "artilleryScanner") > 0
&& {!(_x getVariable [QGVAR(autoAddArtilleryBlocked), false])}
});