diff --git a/addons/aircraft/functions/fnc_droneAddActions.sqf b/addons/aircraft/functions/fnc_droneAddActions.sqf index 895004f0e96..cf5bcbe536a 100644 --- a/addons/aircraft/functions/fnc_droneAddActions.sqf +++ b/addons/aircraft/functions/fnc_droneAddActions.sqf @@ -33,7 +33,7 @@ private _statement = { private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0; [QGVAR(droneSetWaypoint), [_vehicle, _group, _pos, "MOVE"], _group] call CBA_fnc_targetEvent; }; -private _action = [QGVAR(droneSetWaypointMove), localize "$STR_AC_MOVE", +private _action = [QGVAR(droneSetWaypointMove), localize "$STR_AC_MOVE", "\a3\3DEN\Data\CfgWaypoints\Move_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction); [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); @@ -99,7 +99,7 @@ if (_vehicle isKindOf "Air") then { private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0; [QGVAR(droneSetWaypoint), [_vehicle, _group, _pos, "LOITER"], _group] call CBA_fnc_targetEvent; }; - _action = [QGVAR(droneSetWaypointLoiter), localize "$STR_AC_LOITER", + _action = [QGVAR(droneSetWaypointLoiter), localize "$STR_AC_LOITER", "\a3\3DEN\Data\CfgWaypoints\Loiter_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction); [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); @@ -108,13 +108,13 @@ if (_vehicle isKindOf "Air") then { _condition = { params ["_vehicle"]; (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} - }; + }; _statement = { params ["_vehicle", "", "_args"]; private _group = group driver _vehicle; [QGVAR(droneModifyWaypoint), [_vehicle, _group, "height", _args], _group] call CBA_fnc_targetEvent; }; - _action = [QGVAR(setAltitude), localize "$STR_3den_waypoint_attribute_loiteraltitude_displayname", + _action = [QGVAR(setAltitude), localize "$STR_3den_waypoint_attribute_loiteraltitude_displayname", "", {}, _condition] call EFUNC(interact_menu,createAction); private _base = [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); { @@ -129,15 +129,15 @@ if (_vehicle isKindOf "Air") then { private _group = group driver _vehicle; private _index = (currentWaypoint _group) min count waypoints _group; private _waypoint = [_group, _index]; - (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} + (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {(waypointType _waypoint) == "LOITER"} - }; + }; _statement = { params ["_vehicle", "", "_args"]; private _group = group driver _vehicle; [QGVAR(droneModifyWaypoint), [_vehicle, _group, "radius", _args], _group] call CBA_fnc_targetEvent; }; - _action = [QGVAR(lotierRadius), localize "$STR_3den_waypoint_attribute_loiterradius_displayname", + _action = [QGVAR(lotierRadius), localize "$STR_3den_waypoint_attribute_loiterradius_displayname", "", {}, _condition] call EFUNC(interact_menu,createAction); _base = [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); { @@ -153,7 +153,7 @@ if (_vehicle isKindOf "Air") then { private _index = (currentWaypoint _group) min count waypoints _group; private _waypoint = [_group, _index]; - (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} + (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {(waypointType _waypoint) == "LOITER"} && {(waypointLoiterType _waypoint) != _args} }; _statement = { @@ -161,10 +161,10 @@ if (_vehicle isKindOf "Air") then { private _group = group driver _vehicle; [QGVAR(droneModifyWaypoint), [_vehicle, _group, "dir", _args], _group] call CBA_fnc_targetEvent; }; - _action = [QGVAR(lotierTypeR), localize "$STR_3den_waypoint_attribute_loiterdirection_displayname", + _action = [QGVAR(lotierTypeR), localize "$STR_3den_waypoint_attribute_loiterdirection_displayname", "\a3\3DEN\Data\Attributes\LoiterDirection\cw_ca.paa", _statement, _condition, {}, "CIRCLE"] call EFUNC(interact_menu,createAction); [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); - _action = [QGVAR(lotierTypeR), localize "$STR_3den_waypoint_attribute_loiterdirection_displayname", + _action = [QGVAR(lotierTypeR), localize "$STR_3den_waypoint_attribute_loiterdirection_displayname", "\a3\3DEN\Data\Attributes\LoiterDirection\ccw_ca.paa", _statement, _condition, {}, "CIRCLE_L"] call EFUNC(interact_menu,createAction); [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject); }; diff --git a/addons/aircraft/functions/fnc_droneGetTurretTargetPos.sqf b/addons/aircraft/functions/fnc_droneGetTurretTargetPos.sqf index f3914f4af67..ea4e70b8732 100644 --- a/addons/aircraft/functions/fnc_droneGetTurretTargetPos.sqf +++ b/addons/aircraft/functions/fnc_droneGetTurretTargetPos.sqf @@ -14,7 +14,7 @@ * * Public: No */ - + params ["_vehicle"]; private _turret = [0]; TRACE_2("droneGetTurretTargetPos",_vehicle,_turret); diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 0511c05a25a..28b1717350e 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -164,7 +164,7 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetText _textStatementResult; _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar)); - + //Height based on Text lines { _x ctrlSetPositionH (ctrlTextHeight _statsTextCtrl); @@ -186,7 +186,7 @@ private _fnc_handleStats = { _statsTextCtrl ]; }; - + { _x ctrlCommit 0; } forEach [ diff --git a/addons/attach/functions/fnc_placeApprove.sqf b/addons/attach/functions/fnc_placeApprove.sqf index 9e9f8effba4..6af65e37d31 100644 --- a/addons/attach/functions/fnc_placeApprove.sqf +++ b/addons/attach/functions/fnc_placeApprove.sqf @@ -100,7 +100,7 @@ private _dirAndUp = [[[0,1,0],[0,0,1]], -_yaw, 0, _roll] call BIS_fnc_transformV // Transform dir and up vector from player model to world, then to model-space of _attachToVehicle private _dir = _unit vectorModelToWorldVisual _dirAndUp#0; -_dir = _attachToVehicle vectorWorldToModelVisual _dir; +_dir = _attachToVehicle vectorWorldToModelVisual _dir; private _up = _unit vectorModelToWorldVisual _dirAndUp#1; _up = _attachToVehicle vectorWorldToModelVisual _up; diff --git a/addons/casings/functions/fnc_createCasing.sqf b/addons/casings/functions/fnc_createCasing.sqf index 428d940414a..990bef16b2e 100644 --- a/addons/casings/functions/fnc_createCasing.sqf +++ b/addons/casings/functions/fnc_createCasing.sqf @@ -35,7 +35,7 @@ private _modelPath = GVAR(cachedCasings) getOrDefaultCall [_ammo, { // use casing's default model private _model = getText (_cartridgeConfig >> "model"); if ("a3\weapons_f\empty" in toLowerANSI _model) exitWith { "" }; - + // Add file extension if missing (fileExists needs file extension) if ((_model select [count _model - 4]) != ".p3d") then { _model = _model + ".p3d"; diff --git a/addons/compat_rf/CfgVehicles.hpp b/addons/compat_rf/CfgVehicles.hpp index fa0343908a9..bb2e1fa6e5f 100644 --- a/addons/compat_rf/CfgVehicles.hpp +++ b/addons/compat_rf/CfgVehicles.hpp @@ -4,13 +4,13 @@ class CfgVehicles { class Pickup_01_base_rf: Offroad_01_unarmed_base_F { EXGVAR(field_rations,offset)[] = {-0.04, -2.45, -0.9}; }; - + // Enable Water Source by Default class C_IDAP_Pickup_rf; class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf { EXGVAR(field_rations,waterSupply) = 500; }; - + class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { EXGVAR(field_rations,waterSupply) = 10000; diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp index 2983525ec87..f8779b302c7 100644 --- a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp +++ b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp @@ -66,7 +66,7 @@ class CfgVehicles { class C_Truck_01_water_rf: B_Truck_01_fuel_F { displayName = SUBCSTRING(truck_01_water_Name); }; - + // Typhoon class O_Truck_03_fuel_F; class C_Truck_03_water_rf: O_Truck_03_fuel_F { diff --git a/addons/concertina_wire/data/model.cfg b/addons/concertina_wire/data/model.cfg index b8e9fe75c95..6fe1f5c8f14 100644 --- a/addons/concertina_wire/data/model.cfg +++ b/addons/concertina_wire/data/model.cfg @@ -1,4 +1,4 @@ -class CfgSkeletons { +class CfgSkeletons { class Default { isDiscrete = 1; skeletonInherit = ""; @@ -213,7 +213,7 @@ class CfgModels { class wire_18_1: wire_2_1 { selection = "18"; axis = "18_axis"; }; - }; + }; }; class ACE_ConcertinaWireCoil: Default {}; class ACE_ConcertinaWireNoGeo: ACE_ConcertinaWire {}; @@ -232,7 +232,7 @@ class CfgModels { maxValue = 90; angle0="rad 0"; angle1="rad +90"; - }; + }; class extract_1 { type = "translation"; source = ""; diff --git a/addons/csw/data/model.cfg b/addons/csw/data/model.cfg index 2104dca5a5c..3925dabfe86 100644 --- a/addons/csw/data/model.cfg +++ b/addons/csw/data/model.cfg @@ -66,4 +66,3 @@ class CfgModels { skeletonName = "ACE_CSW_mortarBaseplate_Skeleton"; }; }; - diff --git a/addons/csw/functions/fnc_getUnloadActions.sqf b/addons/csw/functions/fnc_getUnloadActions.sqf index 03f99cd65de..03d6525af49 100644 --- a/addons/csw/functions/fnc_getUnloadActions.sqf +++ b/addons/csw/functions/fnc_getUnloadActions.sqf @@ -46,7 +46,7 @@ private _statement = { private _condition = { params ["_target", "_player", "_args"]; _args params ["_vehMag", "_turretPath", "_carryMag"]; - + [_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew) && {[_target, _turretPath, _player, _carryMag, _vehMag] call FUNC(reload_canUnloadMagazine)} }; diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf index c072090a60a..ca4992c034b 100644 --- a/addons/dogtags/XEH_postInit.sqf +++ b/addons/dogtags/XEH_postInit.sqf @@ -3,7 +3,7 @@ if (hasInterface || isServer) then { [QGVAR(broadcastDogtagInfo), { GVAR(dogtagsData) set _this; - + if (isNil "CBA_fnc_renameInventoryItem") exitWith {}; // requires https://github.com/CBATeam/CBA_A3/pull/1329 params ["_item", "_dogTagData"]; private _name = _dogtagData param [0, ""]; @@ -12,7 +12,7 @@ if (hasInterface || isServer) then { if (_name == "") then { _name = LELSTRING(common,unknown); }; - + _name = [LLSTRING(itemName), ": ", _name] joinString ""; [_item, _name] call CBA_fnc_renameInventoryItem; }] call CBA_fnc_addEventHandler; diff --git a/addons/dragging/anim/model.cfg b/addons/dragging/anim/model.cfg index 6be7f511b5c..9d25c0826e1 100644 --- a/addons/dragging/anim/model.cfg +++ b/addons/dragging/anim/model.cfg @@ -10,7 +10,7 @@ class cfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy @@ -116,4 +116,3 @@ class cfgSkeletons { pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d"; }; }; - diff --git a/addons/dragon/models/model.cfg b/addons/dragon/models/model.cfg index ab93f7e9a8a..836a8b8c0d2 100644 --- a/addons/dragon/models/model.cfg +++ b/addons/dragon/models/model.cfg @@ -4,7 +4,7 @@ class CfgSkeletons { skeletonInherit = ""; skeletonBones[] = {}; }; - + class ace_m47_static_skeleton: Default { skeletonInherit = "Default"; skeletonBones[] = { @@ -22,7 +22,7 @@ class CfgModels { sectionsInherit = ""; sections[] = {}; }; - + class ace_m47_static: Default { sectionsInherit = "Default"; sections[] = {}; diff --git a/addons/explosives/CfgAmmo.hpp b/addons/explosives/CfgAmmo.hpp index bfe48d8fa9e..ae67e4fe284 100644 --- a/addons/explosives/CfgAmmo.hpp +++ b/addons/explosives/CfgAmmo.hpp @@ -9,7 +9,7 @@ class CfgAmmo { // GVAR(size) = 0; is small size // GVAR(size) = 1; is large size class ClaymoreDirectionalMine_Remote_Ammo; - class ACE_ClaymoreDirectionalMine_Remote_Ammo: ClaymoreDirectionalMine_Remote_Ammo { // Wrapper class to avoid unintentional changes to third-party mods. Ref #10105 + class ACE_ClaymoreDirectionalMine_Remote_Ammo: ClaymoreDirectionalMine_Remote_Ammo { // Wrapper class to avoid unintentional changes to third-party mods. Ref #10105 GVAR(magazine) = "ClaymoreDirectionalMine_Remote_Mag"; GVAR(size) = 0; GVAR(defuseObjectPosition)[] = {0, 0, 0.038}; diff --git a/addons/explosives/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf index ddda60e4abd..f4c148d0013 100644 --- a/addons/explosives/functions/fnc_addDetonateActions.sqf +++ b/addons/explosives/functions/fnc_addDetonateActions.sqf @@ -35,8 +35,8 @@ private _explosivesList = []; // Prevent consolidated detonate actions from having the same icon as consolidated place actions of the same explosive type private _icon = if ( - EGVAR(interact_menu,consolidateSingleChild) && - {_detonator == GVAR(activeTrigger)} && + EGVAR(interact_menu,consolidateSingleChild) && + {_detonator == GVAR(activeTrigger)} && {count (_result select {(_x select 4) == getText (_detonatorConfig >> QGVAR(triggerType))}) < 2} ) then { getText (_detonatorConfig >> "picture") diff --git a/addons/fastroping/anim/model.cfg b/addons/fastroping/anim/model.cfg index 942b917d47f..9d25c0826e1 100644 --- a/addons/fastroping/anim/model.cfg +++ b/addons/fastroping/anim/model.cfg @@ -10,7 +10,7 @@ class cfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy diff --git a/addons/field_rations/anim/model.cfg b/addons/field_rations/anim/model.cfg index 0359a942845..848ac9a6aff 100644 --- a/addons/field_rations/anim/model.cfg +++ b/addons/field_rations/anim/model.cfg @@ -13,7 +13,7 @@ class cfgSkeletons "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", //Head skeleton in hierarchy "Neck","Spine3", "Neck1","Neck", diff --git a/addons/fortify/functions/fnc_addActions.sqf b/addons/fortify/functions/fnc_addActions.sqf index 7ac07d1693a..d250218ae18 100644 --- a/addons/fortify/functions/fnc_addActions.sqf +++ b/addons/fortify/functions/fnc_addActions.sqf @@ -53,9 +53,9 @@ private _subActions = createHashMap; } forEach _objects; { - private _displayName = if (isLocalized _x) then { + private _displayName = if (isLocalized _x) then { localize _x - } else { + } else { if (isText (configFile >> "ACEX_Fortify_Presets" >> _x >> "displayName")) exitWith { getText (configFile >> "ACEX_Fortify_Presets" >> _x >> "displayName") }; if (isText (missionConfigFile >> "ACEX_Fortify_Presets" >> _x >> "displayName")) exitWith { getText (missionConfigFile >> "ACEX_Fortify_Presets" >> _x >> "displayName") }; _x diff --git a/addons/gestures/anim/model.cfg b/addons/gestures/anim/model.cfg index 942b917d47f..9d25c0826e1 100644 --- a/addons/gestures/anim/model.cfg +++ b/addons/gestures/anim/model.cfg @@ -10,7 +10,7 @@ class cfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy diff --git a/addons/goggles/anim/model.cfg b/addons/goggles/anim/model.cfg index dbe5bce4a65..cacafd136a7 100644 --- a/addons/goggles/anim/model.cfg +++ b/addons/goggles/anim/model.cfg @@ -16,7 +16,7 @@ class CfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy diff --git a/addons/gunbag/data/model.cfg b/addons/gunbag/data/model.cfg index b82cefbfdbb..84c8d3e0b98 100644 --- a/addons/gunbag/data/model.cfg +++ b/addons/gunbag/data/model.cfg @@ -15,7 +15,7 @@ class CfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy diff --git a/addons/hellfire/functions/fnc_attackProfile.sqf b/addons/hellfire/functions/fnc_attackProfile.sqf index 71a35f39c4d..32b17bc3295 100644 --- a/addons/hellfire/functions/fnc_attackProfile.sqf +++ b/addons/hellfire/functions/fnc_attackProfile.sqf @@ -48,7 +48,7 @@ private _closingRate = vectorMagnitude velocity _projectile; private _timeToGo = ((_projectilePos distance2D _seekerTargetPos) - 500) / _closingRate; // we could do stuff like desired attack angle, but I'm not going that far today -private _los = _projectilePos vectorFromTo _seekerTargetPos; +private _los = _projectilePos vectorFromTo _seekerTargetPos; _flightParams params ["_pitchRate", "_yawRate"]; @@ -77,13 +77,13 @@ switch (_attackStage) do { }; case STAGE_SEEK_CRUISE: { // Slowly gain altitude while searching for target _missileStateData params ["_heightBeforeStateSwitch", "_initialDistanceToTarget"]; - + // Before 4000 cruise at 5.7 degrees up, then level out _returnTargetPos set [2, _heightBeforeStateSwitch + (_initialDistanceToTarget * sin 5.7)]; - + if (_seekerTargetPos isNotEqualTo [0,0,0]) then { _attackProfileStateParams set [0, STAGE_ATTACK_CRUISE]; - + _attackProfileStateParams set [2, [_projectilePos select 2, _seekerTargetPos distance2D _projectilePos]]; TRACE_1("New Stage: STAGE_ATTACK_CRUISE",_distanceFromLaunch2d); }; diff --git a/addons/hitreactions/XEH_postInit.sqf b/addons/hitreactions/XEH_postInit.sqf index 2750ae11592..3c065c1d4f9 100644 --- a/addons/hitreactions/XEH_postInit.sqf +++ b/addons/hitreactions/XEH_postInit.sqf @@ -20,7 +20,7 @@ }]; }; GVAR(firedEHs) = []; - { + { GVAR(firedEHs) pushBack [_x, [_x, _firedEH] call CBA_fnc_addEventHandler]; } forEach ["ace_firedNonPlayer", "ace_firedPlayer"]; TRACE_1("added EHs",GVAR(firedEHs)); diff --git a/addons/interaction/functions/fnc_addSquadChildren.sqf b/addons/interaction/functions/fnc_addSquadChildren.sqf index 39cbb22f2ab..d0781b7519f 100644 --- a/addons/interaction/functions/fnc_addSquadChildren.sqf +++ b/addons/interaction/functions/fnc_addSquadChildren.sqf @@ -30,13 +30,13 @@ private _fnc_color = { private _units = (units group _player) - [_player]; private _subActions = []; -_subActions pushBack (["drop", localize "str_a3_endgame_notifications_title_drop", "\a3\ui_f\data\igui\cfg\actions\ico_off_ca.paa", +_subActions pushBack (["drop", localize "str_a3_endgame_notifications_title_drop", "\a3\ui_f\data\igui\cfg\actions\ico_off_ca.paa", {[_target] joinSilent grpNull}, {true}] call EFUNC(interact_menu,createAction)); { private _icon = [QPATHTOF(UI\team\team_white_ca.paa), _x call _fnc_color]; private _name = localize format ["str_assign_%1", _x]; - _subActions pushBack ([_x, _name, _icon, + _subActions pushBack ([_x, _name, _icon, {[_target, _this#2] call FUNC(joinTeam)}, {assignedTeam _target != _this#2}, {}, _x] call EFUNC(interact_menu,createAction)); } forEach ["RED", "GREEN", "BLUE", "YELLOW", "MAIN"]; diff --git a/addons/laser/functions/fnc_addMapHandler.sqf b/addons/laser/functions/fnc_addMapHandler.sqf index 7e10122c059..a5822d3d2d1 100644 --- a/addons/laser/functions/fnc_addMapHandler.sqf +++ b/addons/laser/functions/fnc_addMapHandler.sqf @@ -35,7 +35,7 @@ GVAR(mapLaserSource) = call { TRACE_1("using player's vehicle",_vehicle); _vehicle }; - if (GVAR(showLaserOnMap) == 2) exitWith { + if (GVAR(showLaserOnMap) == 2) exitWith { TRACE_1("setting - no UAV or vehicle",GVAR(showLaserOnMap)); objNull }; diff --git a/addons/laser/functions/fnc_keyLaserCodeChange.sqf b/addons/laser/functions/fnc_keyLaserCodeChange.sqf index 1477fe75c14..ae6efb1dd22 100644 --- a/addons/laser/functions/fnc_keyLaserCodeChange.sqf +++ b/addons/laser/functions/fnc_keyLaserCodeChange.sqf @@ -42,9 +42,9 @@ if (isNull (ACE_controlledUAV param [0, objNull])) then { TRACE_2("",_currentShooter,_currentWeapon); private _currentWeaponCfg = configFile >> "CfgWeapons" >> _currentWeapon; if ( - (getNumber (_currentWeaponCfg >> "laser") == 0) && - { - !(_currentShooter getVariable [QGVAR(hasLaserSpotTracker), false]) && + (getNumber (_currentWeaponCfg >> "laser") == 0) && + { + !(_currentShooter getVariable [QGVAR(hasLaserSpotTracker), false]) && {(getNumber (_currentWeaponCfg >> QGVAR(canSelect))) == 0} } ) exitWith {false}; diff --git a/addons/maverick/CfgMagazines.hpp b/addons/maverick/CfgMagazines.hpp index 1e51ede8b01..3cfb4d53b0b 100644 --- a/addons/maverick/CfgMagazines.hpp +++ b/addons/maverick/CfgMagazines.hpp @@ -12,7 +12,7 @@ class CfgMagazines { class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {}; class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {}; - + // Optical Mavericks class GVAR(D_magazine): 6Rnd_Missile_AGM_02_F { ammo = QGVAR(D); @@ -62,7 +62,7 @@ class CfgMagazines { displayName = CSTRING(g_mag_x3); pylonWeapon = QGVAR(G_Launcher); }; - + class GVAR(G_PylonRack_x1): PylonRack_Missile_AGM_02_x1 { ammo = QGVAR(G); author = "Dani (TCVM)"; diff --git a/addons/medical_status/XEH_postInit.sqf b/addons/medical_status/XEH_postInit.sqf index 3f342987c92..65e308fa301 100644 --- a/addons/medical_status/XEH_postInit.sqf +++ b/addons/medical_status/XEH_postInit.sqf @@ -9,7 +9,7 @@ // apply to all living and dead now { [QGVAR(addInventoryActions), _x] call CBA_fnc_localEvent; -} forEach (allUnits + allDeadMen); +} forEach (allUnits + allDeadMen); // apply to all future units ["CAManBase", "init", LINKFUNC(addInventoryActions), true, [], false] call CBA_fnc_addClassEventHandler; // Respawn is called locally diff --git a/addons/medical_treatment/functions/fnc_canDigGrave.sqf b/addons/medical_treatment/functions/fnc_canDigGrave.sqf index 444fb5ff3c7..bf843d4ff84 100644 --- a/addons/medical_treatment/functions/fnc_canDigGrave.sqf +++ b/addons/medical_treatment/functions/fnc_canDigGrave.sqf @@ -20,7 +20,7 @@ params ["_medic", "_patient"]; if !(["ace_trenches"] call EFUNC(common,isModLoaded)) exitWith {false}; -(GVAR(allowGraveDigging) > 0) -&& {!((_patient isKindOf "CaManBase") && {_patient call EFUNC(common,isAwake)})} -&& {_patient call EFUNC(common,canDig)} +(GVAR(allowGraveDigging) > 0) +&& {!((_patient isKindOf "CaManBase") && {_patient call EFUNC(common,isAwake)})} +&& {_patient call EFUNC(common,canDig)} && {_medic call EFUNC(trenches,hasEntrenchingTool)} diff --git a/addons/medical_treatment/functions/fnc_medicationLocal.sqf b/addons/medical_treatment/functions/fnc_medicationLocal.sqf index cb140deaeab..a9d0ae8a113 100644 --- a/addons/medical_treatment/functions/fnc_medicationLocal.sqf +++ b/addons/medical_treatment/functions/fnc_medicationLocal.sqf @@ -21,7 +21,7 @@ #define MORPHINE_PAIN_SUPPRESSION 0.6 // 0.2625 = 0.6/0.8 * 0.35 // 0.6 = basic medication morph. pain suppr., 0.8 = adv. medication morph. pain suppr., 0.35 = adv. medication painkillers. pain suppr. -#define PAINKILLERS_PAIN_SUPPRESSION 0.2625 +#define PAINKILLERS_PAIN_SUPPRESSION 0.2625 params ["_patient", "_bodyPart", "_classname"]; TRACE_3("medicationLocal",_patient,_bodyPart,_classname); diff --git a/addons/medical_treatment/functions/fnc_placeBodyBagInGrave.sqf b/addons/medical_treatment/functions/fnc_placeBodyBagInGrave.sqf index 55908b1e17d..1715909c4c1 100644 --- a/addons/medical_treatment/functions/fnc_placeBodyBagInGrave.sqf +++ b/addons/medical_treatment/functions/fnc_placeBodyBagInGrave.sqf @@ -29,7 +29,7 @@ TRACE_2("placeBodyBagInGrave",_bodybag,_medic); if (GVAR(graveDiggingMarker)) then { _graveClassname = missionNamespace getVariable [QGVAR(graveClassname), "ACE_Grave"]; }; - private _graveRotation = missionNamespace getVariable [QGVAR(graveRotation), 0]; + private _graveRotation = missionNamespace getVariable [QGVAR(graveRotation), 0]; [[_medic, _bodybag], _graveClassname, [0,0,0], _graveRotation, true] call FUNC(placeInBodyBagOrGrave); }, diff --git a/addons/medical_treatment/functions/fnc_placeInGrave.sqf b/addons/medical_treatment/functions/fnc_placeInGrave.sqf index afc6a1fe4a2..908eea026d8 100644 --- a/addons/medical_treatment/functions/fnc_placeInGrave.sqf +++ b/addons/medical_treatment/functions/fnc_placeInGrave.sqf @@ -27,7 +27,6 @@ private _graveClassname = ""; if (GVAR(graveDiggingMarker)) then { _graveClassname = missionNamespace getVariable [QGVAR(graveClassname), "ACE_Grave"]; }; -private _graveRotation = missionNamespace getVariable [QGVAR(graveRotation), 0]; +private _graveRotation = missionNamespace getVariable [QGVAR(graveRotation), 0]; [_this, _graveClassname, [0,0,0], _graveRotation, true] call FUNC(placeInBodyBagOrGrave) - diff --git a/addons/microdagr/functions/fnc_updateDisplay.sqf b/addons/microdagr/functions/fnc_updateDisplay.sqf index 5407635d0de..14ac3da28be 100644 --- a/addons/microdagr/functions/fnc_updateDisplay.sqf +++ b/addons/microdagr/functions/fnc_updateDisplay.sqf @@ -170,7 +170,7 @@ case (APP_MODE_WAYPOINTS): { private _currWaypointsCount = count _waypoints; if (_currWaypointsCount > (GVAR(prevWaypointsCount))) then { _currentIndex = _currWaypointsCount - 1; - } else { + } else { _currentIndex = (_currentIndex max 0) min (_currWaypointsCount - 1); }; if ((lbCurSel _wpListBox) != _currentIndex) then { diff --git a/addons/missileguidance/dev/getAmmoProperties.sqf b/addons/missileguidance/dev/getAmmoProperties.sqf index 9c416c228fd..2fba8ab2d47 100644 --- a/addons/missileguidance/dev/getAmmoProperties.sqf +++ b/addons/missileguidance/dev/getAmmoProperties.sqf @@ -9,7 +9,7 @@ private _attackProfiles = createHashMap; private _seekerType = getText (_x >> QUOTE(ADDON) >> "defaultSeekerType"); private _navigationType = getText (_x >> QUOTE(ADDON) >> "defaultNavigationType"); private _attackProfile = getText (_x >> QUOTE(ADDON) >> "defaultAttackProfile"); - + private _seekers = _seekerTypes getOrDefault [_seekerType, []]; private _navigations = _navigationTypes getOrDefault [_navigationType, []]; private _attacks = _attackProfiles getOrDefault [_attackProfile, []]; diff --git a/addons/missileguidance/functions/fnc_attackProfile_LOFT.sqf b/addons/missileguidance/functions/fnc_attackProfile_LOFT.sqf index 934ac04123a..9045ad43c0e 100644 --- a/addons/missileguidance/functions/fnc_attackProfile_LOFT.sqf +++ b/addons/missileguidance/functions/fnc_attackProfile_LOFT.sqf @@ -38,7 +38,7 @@ private _closingRate = vectorMagnitude velocity _projectile; private _timeToGo = (_projectilePos distance _seekerTargetPos) / _closingRate; // we could do stuff like desired attack angle, but I'm not going that far today -private _los = vectorNormalized (_seekerTargetPos vectorDiff _projectilePos); +private _los = vectorNormalized (_seekerTargetPos vectorDiff _projectilePos); private _angleToTarget = acos ((vectorDir _projectile) vectorCos _los); private _atMinRotationAngle = _angleToTarget >= (0.5 * _pitchRate * _timeToGo); diff --git a/addons/missileguidance/functions/fnc_guidancePFH.sqf b/addons/missileguidance/functions/fnc_guidancePFH.sqf index 82d3d57a35f..d7073f48041 100644 --- a/addons/missileguidance/functions/fnc_guidancePFH.sqf +++ b/addons/missileguidance/functions/fnc_guidancePFH.sqf @@ -33,7 +33,7 @@ if (!alive _projectile || isNull _projectile || isNull _shooter) exitWith { }; if (_showTrail) then { - drop ["\a3\data_f\kouleSvetlo", "", "Billboard", 100, 0.03, _projectile modelToWorld [0, 0, 0], + drop ["\a3\data_f\kouleSvetlo", "", "Billboard", 100, 0.03, _projectile modelToWorld [0, 0, 0], [0, 0, 0], 0, 1.25, 1, 0.05, [0.5], [TRAIL_COLOUR(1)], [0], 0, 0, "", "", "", 0, false, -1, [TRAIL_COLOUR(10000)]]; }; @@ -67,7 +67,7 @@ if ((_pitchRate != 0 || {_yawRate != 0}) && {_profileAdjustedTargetPos isNotEqua _stateParams set [4, _navigationParameters]; }; private _commandedAcceleration = [_args, _timestep, _seekerTargetPos, _profileAdjustedTargetPos, _targetData, _navigationParameters] call (missionNamespace getVariable _navigationFunction); - + if (isNil "_commandedAcceleration") exitWith { systemChat format ["Error in %1 Missile Type %2 Seeker Pos %3", _navigationFunction, typeOf _projectile, _seekerTargetPos]; ERROR_MSG_3("_commandedAcceleration is nil! Guidance cancelled [%1 %2 %3]",_navigationFunction,typeOf _projectile,_seekerTargetPos); @@ -97,7 +97,7 @@ if ((_pitchRate != 0 || {_yawRate != 0}) && {_profileAdjustedTargetPos isNotEqua private _clampedPitch = (_pitchChange min _pitchRate) max -_pitchRate; private _clampedYaw = (_yawChange min _yawRate) max -_yawRate; - + // controls are either on or off, no proportional if (_isBangBangGuidance) then { private _pitchSign = if (_clampedPitch == 0) then { @@ -124,7 +124,7 @@ if ((_pitchRate != 0 || {_yawRate != 0}) && {_profileAdjustedTargetPos isNotEqua // bastardized version of direction stability https://en.wikipedia.org/wiki/Directional_stability#Steering_forces private _forceYaw = _stabilityCoefficient * _velocityAngleYaw + _clampedYaw; private _forcePitch = _stabilityCoefficient * _velocityAnglePitch + _clampedPitch; - + _pitch = _pitch + _forcePitch * _timestep; _yaw = _yaw + _forceYaw * _timestep; @@ -153,7 +153,7 @@ if ((_pitchRate != 0 || {_yawRate != 0}) && {_profileAdjustedTargetPos isNotEqua _quaternion#1, _quaternion#2 ]; - + private _vectorReturn = _vector vectorAdd (( _imaginary vectorCrossProduct ( (_imaginary vectorCrossProduct _vector) vectorAdd ( @@ -172,7 +172,7 @@ if ((_pitchRate != 0 || {_yawRate != 0}) && {_profileAdjustedTargetPos isNotEqua _temp = [sin (_pitch / 2), 0, 0, cos (_pitch / 2)]; _quaternion = [_quaternion, _temp] call _multiplyQuat; - + private _dir = [_quaternion, [0, 1, 0]] call _multiplyVector; private _up = [_quaternion, [0, 0, 1]] call _multiplyVector; diff --git a/addons/missileguidance/functions/fnc_navigationType_augmentedProNav.sqf b/addons/missileguidance/functions/fnc_navigationType_augmentedProNav.sqf index f8f1e6c0f42..f53c2b43c3b 100644 --- a/addons/missileguidance/functions/fnc_navigationType_augmentedProNav.sqf +++ b/addons/missileguidance/functions/fnc_navigationType_augmentedProNav.sqf @@ -32,7 +32,7 @@ private _losDelta = (vectorNormalized _attackProfileDirection) vectorDiff (vecto private _losRate = if (_timestep == 0) then { 0 } else { - 1 * (vectorMagnitude _losDelta) / _timestep; + 1 * (vectorMagnitude _losDelta) / _timestep; }; private _lateralAcceleration = _navigationGain * _losRate; diff --git a/addons/missileguidance/functions/fnc_navigationType_lineOfSight.sqf b/addons/missileguidance/functions/fnc_navigationType_lineOfSight.sqf index 5056d837228..958bc62ade9 100644 --- a/addons/missileguidance/functions/fnc_navigationType_lineOfSight.sqf +++ b/addons/missileguidance/functions/fnc_navigationType_lineOfSight.sqf @@ -30,7 +30,7 @@ private _losDelta = _attackProfileDirection vectorDiff _lastLineOfSight; private _losRate = if (_timestep == 0) then { 0 } else { - 10 * (vectorMagnitude _losDelta) / _timestep; + 10 * (vectorMagnitude _losDelta) / _timestep; }; private _closingVelocity = _targetVelocity vectorDiff (velocity _projectile); diff --git a/addons/missileguidance/functions/fnc_navigationType_proNav.sqf b/addons/missileguidance/functions/fnc_navigationType_proNav.sqf index 45052689b05..14e90466c39 100644 --- a/addons/missileguidance/functions/fnc_navigationType_proNav.sqf +++ b/addons/missileguidance/functions/fnc_navigationType_proNav.sqf @@ -29,7 +29,7 @@ private _losDelta = (vectorNormalized _attackProfileDirection) vectorDiff (vecto private _losRate = if (_timestep == 0) then { 0 } else { - 1 * (vectorMagnitude _losDelta) / _timestep; + 1 * (vectorMagnitude _losDelta) / _timestep; }; private _lateralAcceleration = _navigationGain * _losRate; diff --git a/addons/missileguidance/functions/fnc_proNav_onFired.sqf b/addons/missileguidance/functions/fnc_proNav_onFired.sqf index f89584c7df0..81bf326aa0d 100644 --- a/addons/missileguidance/functions/fnc_proNav_onFired.sqf +++ b/addons/missileguidance/functions/fnc_proNav_onFired.sqf @@ -26,7 +26,7 @@ if (_navigationGain == 0) then { private _navigationParams = [ [ // Last Missile Frame [0, 0, 0] // Last line of sight - ], + ], _navigationGain // navigation gain of missile. Set in the navigation onFired function ]; _navigationParams diff --git a/addons/nightvision/functions/fnc_pfeh.sqf b/addons/nightvision/functions/fnc_pfeh.sqf index 9d5f6e93bb8..d2d6acbcddd 100644 --- a/addons/nightvision/functions/fnc_pfeh.sqf +++ b/addons/nightvision/functions/fnc_pfeh.sqf @@ -165,7 +165,7 @@ if (CBA_missionTime < GVAR(nextEffectsUpdate)) then { _fogApply = linearConversion [0, 1, GVAR(priorFog) select 0, (GVAR(fogScaling) * _fogApply), 1]; // mix in old fog if present GVAR(nvgFog) = fogParams; GVAR(nvgFog) set [0, _fogApply]; - + 0 setFog GVAR(nvgFog) }; diff --git a/addons/noradio/initSettings.inc.sqf b/addons/noradio/initSettings.inc.sqf index 5c558064da9..794796710e8 100644 --- a/addons/noradio/initSettings.inc.sqf +++ b/addons/noradio/initSettings.inc.sqf @@ -1,8 +1,8 @@ [ - QGVAR(enabled), "CHECKBOX", - [LSTRING(setting), LSTRING(setting_tooltip)], + QGVAR(enabled), "CHECKBOX", + [LSTRING(setting), LSTRING(setting_tooltip)], [LELSTRING(Common,CategoryUncategorized), LLSTRING(DisplayName)], - true, + true, true, { params ["_enabled"]; diff --git a/addons/refuel/data/hose.cfg b/addons/refuel/data/hose.cfg index a49123a444b..85dd956c00c 100644 --- a/addons/refuel/data/hose.cfg +++ b/addons/refuel/data/hose.cfg @@ -4,4 +4,4 @@ class CfgModels { sections[] = {"rope"}; skeletonName = ""; }; -}; \ No newline at end of file +}; diff --git a/addons/refuel/functions/fnc_getCapacity.sqf b/addons/refuel/functions/fnc_getCapacity.sqf index c6218831dad..fc482b11e72 100644 --- a/addons/refuel/functions/fnc_getCapacity.sqf +++ b/addons/refuel/functions/fnc_getCapacity.sqf @@ -26,7 +26,7 @@ if (isNil "_capacity") then { // Check if this object has a fuelCargo config entry private _fuelCargo = configOf _source >> QGVAR(fuelCargo); _capacity = if (isNumber _fuelCargo) then {getNumber _fuelCargo} else {REFUEL_DISABLED_FUEL}; - + // Set capacity even if this isn't a fuel source to save on config lookup time in the event this function is used in a loop _source setVariable [QGVAR(capacity), _capacity, true]; // handle weird edge case when trying to run on "camera"/CfgNonAIVehicles which won't support setVariable and will inf-loop diff --git a/addons/refuel/functions/fnc_refuel.sqf b/addons/refuel/functions/fnc_refuel.sqf index 1cf7b4377ac..63a89ef4db3 100644 --- a/addons/refuel/functions/fnc_refuel.sqf +++ b/addons/refuel/functions/fnc_refuel.sqf @@ -64,11 +64,11 @@ if (_maxFuelTank == 0) then { private _fueling = _nozzle getVariable [QGVAR(isRefueling), false]; if (_fueling) then { private _refuelContainer = _nozzle getVariable [QGVAR(refuelContainer), false]; - + // Use special cargo refuel rate when refueling containers // TODO: Add flow dedicated input/output flow rates for every container and use the lower of the two instead if (_refuelContainer) then {_rate = GVAR(cargoRate)}; - + // Calculate rate using mission time to take time acceleration and pause into account private _addedFuel = _rate * (CBA_missionTime - (_nozzle getVariable [QGVAR(lastTickMissionTime), CBA_missionTime])); _nozzle setVariable [QGVAR(lastTickMissionTime), CBA_missionTime]; @@ -85,14 +85,14 @@ if (_maxFuelTank == 0) then { _fuelInSource = _fuelInSource - _addedFuel; }; }; - + private _fuelInSink = (if (_refuelContainer) then { [_sink] call FUNC(getFuel) } else { // How full the gas tank is. We keep our own record, since `fuel _sink` doesn't update quick enough (_nozzle getVariable [QGVAR(tempFuel), fuel _sink]) * _maxFuelTank }) + _addedFuel; - + // Add fuel to target while being sure not to put too much into sink private _maxFuelContainer = [_sink] call FUNC(getCapacity); private _maxFuel = [_maxFuelTank, _maxFuelContainer] select _refuelContainer; @@ -105,7 +105,7 @@ if (_maxFuelTank == 0) then { _finished = true; [LSTRING(Hint_Completed), 2, _unit] call EFUNC(common,displayTextStructured); }; - + if (_refuelContainer) then { [_sink, _fuelInSink] call FUNC(setFuel); } else { @@ -113,7 +113,7 @@ if (_maxFuelTank == 0) then { [QEGVAR(common,setFuel), [_sink, _fillRatio], _sink] call CBA_fnc_targetEvent; _nozzle setVariable [QGVAR(tempFuel), _fillRatio]; }; - + // Increment fuel counter _source setVariable [QGVAR(fuelCounter), (_source getVariable [QGVAR(fuelCounter), 0]) + _addedFuel, true]; diff --git a/addons/sandbag/data/model.cfg b/addons/sandbag/data/model.cfg index 92055d87bec..50d1678dd23 100644 --- a/addons/sandbag/data/model.cfg +++ b/addons/sandbag/data/model.cfg @@ -1,4 +1,4 @@ -class CfgSkeletons { +class CfgSkeletons { class Default { isDiscrete = 1; skeletonInherit = ""; diff --git a/addons/slideshow/GUI.hpp b/addons/slideshow/GUI.hpp index 87b42aa5700..e5d62d521b2 100644 --- a/addons/slideshow/GUI.hpp +++ b/addons/slideshow/GUI.hpp @@ -29,7 +29,7 @@ class GVAR(mapTopo): GVAR(mapNormal) { }; class GVAR(mapSat): GVAR(mapNormal) { // ref https://feedback.bistudio.com/T170918 - may have problems loading sat textures - maxSatelliteAlpha = 0.95; + maxSatelliteAlpha = 0.95; colorForest[] = {0, 1, 0, 0}; colorForestBorder[] = {0, 1, 0, 0}; }; diff --git a/addons/tacticalladder/data/model.cfg b/addons/tacticalladder/data/model.cfg index ec200139ffd..38cd2ebc022 100644 --- a/addons/tacticalladder/data/model.cfg +++ b/addons/tacticalladder/data/model.cfg @@ -34,7 +34,7 @@ class CfgSkeletons { "Spine3","Spine2", "camera","Pelvis",// case has changed for arma3 "weapon","Spine1", - "launcher","Spine1", + "launcher","Spine1", "Neck","Spine3", "Neck1","Neck", "Head","Neck1", //Head skeleton in hierarchy diff --git a/addons/tagging/data/model.cfg b/addons/tagging/data/model.cfg index dda2be3d823..d3f68de151f 100644 --- a/addons/tagging/data/model.cfg +++ b/addons/tagging/data/model.cfg @@ -17,4 +17,4 @@ class CfgModels { sections[] = {"camo"}; skeletonName = ""; }; -}; \ No newline at end of file +}; diff --git a/addons/tagging/functions/fnc_addStencilTag.sqf b/addons/tagging/functions/fnc_addStencilTag.sqf index f6613856a98..460b4f34a46 100644 --- a/addons/tagging/functions/fnc_addStencilTag.sqf +++ b/addons/tagging/functions/fnc_addStencilTag.sqf @@ -35,7 +35,7 @@ if (_text == "") exitWith { ERROR_1("bad text %1",_text); false }; // Check required item exists if (!isClass (configFile >> "CfgWeapons" >> _requiredItem)) exitWith { ERROR_1("bad item %1",_requiredItem); false }; // Get color from spray item used -if (_textColor == "") then { +if (_textColor == "") then { _textColor = getText (configFile >> "CfgWeapons" >> _requiredItem >> QGVAR(textColor)); if (_textColor == "") then { _textColor = "000000" }; }; diff --git a/addons/trenches/functions/fnc_blockTrench_place.sqf b/addons/trenches/functions/fnc_blockTrench_place.sqf index 4c0a218307b..0251b934990 100644 --- a/addons/trenches/functions/fnc_blockTrench_place.sqf +++ b/addons/trenches/functions/fnc_blockTrench_place.sqf @@ -122,7 +122,7 @@ for "_i" from 0 to _length do { // intentionally inclusive private _missionObjects = nearestObjects [_origin2D, ["All"], _testRadius, true]; _missionObjects = _missionObjects select { !(_x isKindOf "Logic") }; if (_missionObjects isNotEqualTo []) then { - _missionObjects = _missionObjects apply {typeOf _x}; + _missionObjects = _missionObjects apply {typeOf _x}; if (_force) then { WARNING_1("blocking missionObjects %1",_missionObjects); } else { diff --git a/addons/weather/functions/fnc_displayWindInfo.sqf b/addons/weather/functions/fnc_displayWindInfo.sqf index aeb7d580ae9..871d262a84d 100644 --- a/addons/weather/functions/fnc_displayWindInfo.sqf +++ b/addons/weather/functions/fnc_displayWindInfo.sqf @@ -39,7 +39,7 @@ TRACE_1("Starting Wind Info PFEH",GVAR(WindInfo)); private _playerInStaticWeapon = objectParent ACE_Player isKindOf "StaticWeapon"; if ( - (!GVAR(WindInfo)) || + (!GVAR(WindInfo)) || {!([ACE_player, ACE_player, ["notOnMap", "isNotDragging", "isNotCarrying", "isNotSitting"]] call EFUNC(common,canInteractWith)) && !(_playerInStaticWeapon)} ) exitWith { TRACE_1("Ending Wind Info PFEH",GVAR(WindInfo)); diff --git a/addons/weather/functions/fnc_getMapData.sqf b/addons/weather/functions/fnc_getMapData.sqf index 555704fc870..6f865dd87b7 100644 --- a/addons/weather/functions/fnc_getMapData.sqf +++ b/addons/weather/functions/fnc_getMapData.sqf @@ -246,7 +246,7 @@ if (_worldName in ["kunduz"]) exitWith { // Values are not based on any RL reference since the snow terrain textures persists regardless the date _cfgPath = _cfgPath >> "RainParticles"; if ( - "winter" in _worldName || + "winter" in _worldName || {"snow" in getText (_cfgPath >> "rainDropTexture")} || {getNumber (_cfgPath >> "snow") != 0} ) exitWith { diff --git a/addons/xm157/CfgWeapons.hpp b/addons/xm157/CfgWeapons.hpp index cfa8197f48d..f7fd914f639 100644 --- a/addons/xm157/CfgWeapons.hpp +++ b/addons/xm157/CfgWeapons.hpp @@ -11,7 +11,7 @@ class CfgWeapons { model = "\A3\weapons_f\acc\acco_tws_F"; inertia = 0.3; ACE_ScopeHeightAboveRail = 5.52874; - + class CBA_ScriptedOptic { bodyTexture = QPATHTOF(data\ace_vector_body_co.paa); // bodyTextureNight = ".paa"; // optional diff --git a/addons/xm157/functions/fnc_ballistics_calculator.sqf b/addons/xm157/functions/fnc_ballistics_calculator.sqf index 46b09170e3b..ede99205df0 100644 --- a/addons/xm157/functions/fnc_ballistics_calculator.sqf +++ b/addons/xm157/functions/fnc_ballistics_calculator.sqf @@ -42,8 +42,8 @@ private _barometricPressure = _altitude call EFUNC(weather,calculateBarometricPr private _bulletPos = [0,0,-(_boreHeight / 100)]; private _lastBulletPos = +_bulletPos; private _bulletVelocity = [0,cos(_scopeBaseAngle) * _muzzleVelocity,sin(_scopeBaseAngle) * _muzzleVelocity]; -private _gravity = [-sin (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY, - sin(_scopeBaseAngle + _inclinationAngle) * -GRAVITY, +private _gravity = [-sin (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY, + sin(_scopeBaseAngle + _inclinationAngle) * -GRAVITY, cos (_bank) * cos(_scopeBaseAngle + _inclinationAngle) * -GRAVITY]; private _useAB = missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]; diff --git a/addons/xm157/functions/fnc_weaponInfo_draw.sqf b/addons/xm157/functions/fnc_weaponInfo_draw.sqf index c03b575f4e1..7a45c4b4251 100644 --- a/addons/xm157/functions/fnc_weaponInfo_draw.sqf +++ b/addons/xm157/functions/fnc_weaponInfo_draw.sqf @@ -28,7 +28,7 @@ private _ctrlScreenObject = _display displayCtrl IDC_SCREEN_OBJECT; // Hide everything when not in scope private _isUsingOptic = ctrlShown (_display displayCtrl 154); -if (!_isUsingOptic) exitWith { +if (!_isUsingOptic) exitWith { _ctrlScopeObject ctrlShow false; _ctrlScreenObject ctrlShow false; }; diff --git a/addons/xm157/functions/fnc_weaponInfo_drawMenu.sqf b/addons/xm157/functions/fnc_weaponInfo_drawMenu.sqf index ca72adf8075..382263da55a 100644 --- a/addons/xm157/functions/fnc_weaponInfo_drawMenu.sqf +++ b/addons/xm157/functions/fnc_weaponInfo_drawMenu.sqf @@ -63,7 +63,7 @@ if (isNil QGVAR(menu)) then { private _index = GVAR(data) getOrDefault ["menu_index", 0]; (GVAR(menu) # _index) params ["_title", "_var", "_thing"]; -if ((!_needsUpdate) && {_thing isEqualType []}) exitWith {}; +if ((!_needsUpdate) && {_thing isEqualType []}) exitWith {}; private _ctrlMenuText = _display displayCtrl IDC_SCREEN_MENU_TEXT; private _text = ""; diff --git a/addons/xm157/functions/fnc_weaponInfo_onLoad.sqf b/addons/xm157/functions/fnc_weaponInfo_onLoad.sqf index e490c6e14d0..5442bd7f8b4 100644 --- a/addons/xm157/functions/fnc_weaponInfo_onLoad.sqf +++ b/addons/xm157/functions/fnc_weaponInfo_onLoad.sqf @@ -70,7 +70,7 @@ private _ctrl = _display ctrlCreate ["RscPicture", IDC_SCREEN_RETICLE, _ctrlScre // Add dummy idcs for dist/angle from engine -// 151=Dist, 156=Heading, 182=Pitch, +// 151=Dist, 156=Heading, 182=Pitch, private _ctrl = _display ctrlCreate ["RscText", 151]; // IDC_IGUI_WEAPON_DISTANCE _ctrl ctrlSetPosition [-1, -1, 0, 0]; _ctrl ctrlCommit 0; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index fa48ec80793..e35d95557ec 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -665,7 +665,7 @@ class CfgAmmo ACE_muzzleVelocities[]={230, 250, 285}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - + class TMR_B_762x51_M118LR: B_762x51_Ball { ACE_caliber=7.823; @@ -679,7 +679,7 @@ class CfgAmmo ACE_muzzleVelocities[]={750, 780, 790, 794}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - + class RH_50_AE_Ball: BulletBase { ACE_caliber=12.7; @@ -836,7 +836,7 @@ class CfgAmmo ACE_muzzleVelocities[]={550, 625, 720}; ACE_barrelLengths[]={101.6, 152.4, 262.89}; }; - + class RH_9x19_B_M822: BulletBase { ACE_caliber=9.017; @@ -953,7 +953,7 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; - }; + }; class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=7.823; @@ -1045,7 +1045,7 @@ class CfgAmmo ACE_muzzleVelocities[]={305, 325, 335, 340}; ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; - + class HLC_556NATO_SOST: BulletBase { ACE_caliber=5.69; @@ -1243,7 +1243,7 @@ class CfgAmmo ACE_muzzleVelocities[]={340, 370, 400}; ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; - + class M_mas_545x39_Ball_7N6M: BulletBase { ACE_caliber=5.588; @@ -1425,7 +1425,7 @@ class CfgAmmo ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; - }; + }; class B_mas_762x54_Ball: BulletBase { ACE_caliber=7.925; @@ -1478,7 +1478,7 @@ class CfgAmmo ACE_muzzleVelocities[]={300, 340}; ACE_barrelLengths[]={406.4, 609.6}; }; - + class BWA3_B_46x30_Ball: BulletBase { ACE_caliber=4.902; @@ -1492,7 +1492,7 @@ class CfgAmmo ACE_muzzleVelocities[]={680, 720, 730, 740}; ACE_barrelLengths[]={101.6, 177.8, 228.6, 304.8}; }; - + class Trixie_338_Ball: BulletBase { ACE_caliber=8.585; @@ -1519,7 +1519,7 @@ class CfgAmmo ACE_muzzleVelocities[]={748, 761, 765}; ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; - + class rhs_ammo_556x45_Mk318_Ball: BulletBase { ACE_caliber=5.69; @@ -1793,7 +1793,7 @@ class CfgAmmo ACE_muzzleVelocities[]={853}; ACE_barrelLengths[]={736.6}; }; - + class CUP_B_545x39_Ball: BulletBase { ACE_caliber=5.588; @@ -2249,7 +2249,7 @@ class CfgAmmo ACE_muzzleVelocities[]={820, 826, 830}; ACE_barrelLengths[]={609.6, 673.1, 711.2}; }; - + class VTN_9x18_Ball_FMJ: B_9x21_Ball { ACE_caliber=9.271; diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index 3f8ef7d7404..ff75d2a7b3f 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -95,7 +95,7 @@ class CfgWeapons ACE_barrelTwist=228.6; ACE_barrelLength=457.2; }; - class arifle_SDAR_F: SDAR_base_F + class arifle_SDAR_F: SDAR_base_F { ACE_barrelTwist=285.75; ACE_barrelLength=457.2; @@ -345,7 +345,7 @@ class CfgWeapons class RH_fn57: Pistol_Base_F { ACE_barrelTwist=231.14; - ACE_barrelLength=121.92; + ACE_barrelLength=121.92; }; class RH_vp70: Pistol_Base_F { @@ -357,13 +357,13 @@ class CfgWeapons ACE_barrelTwist=246.38; ACE_barrelLength=119.38; }; - + class RH_PDW: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=254.0; }; - + class RH_hb: Rifle_Base_F { ACE_barrelTwist=203.2; @@ -464,7 +464,7 @@ class CfgWeapons ACE_barrelTwist=285.75; ACE_barrelLength=508.0; }; - + class hlc_rifle_ak74: Rifle_Base_F { ACE_barrelTwist=199.898; @@ -606,7 +606,7 @@ class CfgWeapons ACE_barrelTwist=304.8; ACE_barrelLength=558.8; }; - + class hlc_smg_mp5k_PDW: Rifle_Base_F { ACE_barrelTwist=254.0; @@ -652,7 +652,7 @@ class CfgWeapons ACE_barrelTwist=254.0; ACE_barrelLength=226.06; }; - + class hgun_mas_usp_F: Pistol_Base_F { ACE_barrelTwist=406.4; @@ -925,7 +925,7 @@ class CfgWeapons ACE_twistDirection=0; ACE_barrelLength=469.9; }; - + class BWA3_P8: Pistol_Base_F { ACE_barrelTwist=248.92; @@ -971,7 +971,7 @@ class CfgWeapons ACE_barrelTwist=381.0; ACE_barrelLength=736.6; }; - + class Trixie_L131A1: Pistol_Base_F { ACE_barrelTwist=248.92; @@ -1027,7 +1027,7 @@ class CfgWeapons ACE_barrelTwist=304.8; ACE_barrelLength=533.4; }; - + class Trixie_M110: Rifle_Base_F { ACE_barrelTwist=279.4; @@ -1113,7 +1113,7 @@ class CfgWeapons ACE_barrelTwist=304.8; ACE_barrelLength=629.92; }; - + class rhs_weap_pya: Pistol_Base_F { ACE_barrelTwist=254.0; @@ -1295,7 +1295,7 @@ class CfgWeapons ACE_barrelTwist=254.0; ACE_barrelLength=144.78; }; - + class CUP_hgun_Colt1911: Pistol_Base_F { ACE_barrelTwist=406.4; @@ -1305,13 +1305,13 @@ class CfgWeapons { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=457.2; + ACE_barrelLength=457.2; }; class CUP_arifle_AK_Base: Rifle_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=414.02; - }; + }; class CUP_arifle_AK107_Base: Rifle_Base_F { ACE_barrelTwist=199.898; @@ -1331,7 +1331,7 @@ class CfgWeapons { ACE_barrelTwist=195.072; ACE_barrelLength=589.28; - }; + }; class CUP_srifle_AS50: Rifle_Long_Base_F { ACE_barrelTwist=381.0; @@ -1341,7 +1341,7 @@ class CfgWeapons { ACE_barrelTwist=279.4; ACE_barrelLength=685.8; - }; + }; class CUP_smg_bizon: Rifle_Base_F { ACE_barrelTwist=240.03; @@ -1351,12 +1351,12 @@ class CfgWeapons { ACE_barrelTwist=248.92; ACE_barrelLength=94.996; - }; + }; class CUP_srifle_CZ750: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=660.4; - }; + }; class CUP_arifle_CZ805_Base: Rifle_Base_F { ACE_barrelTwist=304.8; @@ -1376,7 +1376,7 @@ class CfgWeapons { ACE_barrelTwist=304.8; ACE_barrelLength=558.8; - }; + }; class CUP_hgun_Duty: Pistol_Base_F { ACE_barrelTwist=248.92; @@ -1386,7 +1386,7 @@ class CfgWeapons { ACE_barrelTwist=304.8; ACE_barrelLength=533.4; - }; + }; class CUP_arifle_G36A: Rifle_Base_F { ACE_barrelTwist=177.8; @@ -1411,32 +1411,32 @@ class CfgWeapons { ACE_barrelTwist=248.92; ACE_barrelLength=114.046; - }; + }; class CUP_srifle_CZ550: Rifle_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=599.999; - }; + }; class CUP_srifle_ksvk: Rifle_Long_Base_F { ACE_barrelTwist=457.2; ACE_barrelLength=999.998; - }; + }; class CUP_lmg_L7A2: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=629.92; - }; + }; class CUP_arifle_L85A2_Base: Rifle_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=518.16; - }; + }; class CUP_lmg_L110A1: Rifle_Long_Base_F { ACE_barrelTwist=177.8; ACE_barrelLength=347.98; - }; + }; class CUP_srifle_LeeEnfield: Rifle_Base_F { ACE_barrelTwist=254.0; @@ -1471,7 +1471,7 @@ class CfgWeapons { ACE_barrelTwist=285.75; ACE_barrelLength=609.6; - }; + }; class CUP_lmg_M60A4: Rifle_Long_Base_F { ACE_barrelTwist=304.8; @@ -1507,22 +1507,22 @@ class CfgWeapons ACE_twistDirection=0; ACE_barrelTwist=0.0; ACE_barrelLength=469.9; - }; + }; class CUP_hgun_Makarov: Pistol_Base_F { ACE_barrelTwist=240.03; ACE_barrelLength=93.472; - }; + }; class CUP_hgun_MicroUzi: Pistol_Base_F { ACE_barrelTwist=248.92; ACE_barrelLength=127.0; - }; + }; class CUP_lmg_Mk48_Base: Rifle_Long_Base_F { ACE_barrelTwist=304.8; ACE_barrelLength=501.65; - }; + }; class CUP_smg_MP5SD6: Rifle_Base_F { ACE_barrelTwist=254.0; @@ -1532,7 +1532,7 @@ class CfgWeapons { ACE_barrelTwist=254.0; ACE_barrelLength=226.06; - }; + }; class CUP_hgun_PB6P9: Rifle_Base_F { ACE_barrelTwist=240.03; @@ -1542,7 +1542,7 @@ class CfgWeapons { ACE_barrelTwist=246.38; ACE_barrelLength=119.38; - }; + }; class CUP_lmg_PKM: Rifle_Long_Base_F { ACE_barrelTwist=240.03; @@ -1552,7 +1552,7 @@ class CfgWeapons { ACE_barrelTwist=240.03; ACE_barrelLength=657.86; - }; + }; class CUP_hgun_TaurusTracker455: Pistol_Base_F { ACE_barrelTwist=304.8; @@ -1593,19 +1593,19 @@ class CfgWeapons { ACE_barrelTwist=177.8; ACE_barrelLength=457.2; - }; + }; class CUP_arifle_Mk17_CQC: Rifle_Base_F - { + { ACE_barrelTwist=304.8; ACE_barrelLength=330.2; }; class CUP_arifle_Mk17_STD: Rifle_Base_F - { + { ACE_barrelTwist=304.8; ACE_barrelLength=406.4; }; class CUP_arifle_Mk20: Rifle_Base_F - { + { ACE_barrelTwist=304.8; ACE_barrelLength=508.0; }; @@ -1642,7 +1642,7 @@ class CfgWeapons class CUP_M240_veh_W: Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=629.92; + ACE_barrelLength=629.92; }; class CUP_PKT_W: MGun { @@ -1689,7 +1689,7 @@ class CfgWeapons ACE_barrelTwist=177.8; ACE_barrelLength=317.5; }; - + class VTN_AK_BASE: Rifle_Base_F { ACE_barrelTwist=199.898; diff --git a/optionals/tracers/model.cfg b/optionals/tracers/model.cfg index fd53eb557e7..769c435d521 100644 --- a/optionals/tracers/model.cfg +++ b/optionals/tracers/model.cfg @@ -1,4 +1,4 @@ -class CfgSkeletons { +class CfgSkeletons { class Default { isDiscrete = 1; skeletonInherit = ""; diff --git a/tools/make.cfg b/tools/make.cfg index 5045099e26d..feebf23b078 100644 --- a/tools/make.cfg +++ b/tools/make.cfg @@ -17,7 +17,7 @@ project = @ace # Default: \private_keys\ace_3.0.0.biprivatekey # key = P:\private_keys\ace_3.0.0.biprivatekey -# Path to where private keys are automatically created if the command-line parameter "key" is used +# Path to where private keys are automatically created if the command-line parameter "key" is used # Make sure this isn't in your public repository! # Default: \private_keys # private_key_path = P:\private_keys @@ -90,4 +90,3 @@ build_tool = pboproject # [Fixed] # module_autodetect = False # modules = my_module, my_other_module -