Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General - Cleanup trailing whitespace in config/code #10478

Merged
merged 2 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions addons/aircraft/functions/fnc_droneAddActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand All @@ -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);
{
Expand All @@ -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);
{
Expand All @@ -153,18 +153,18 @@ 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 = {
params ["_vehicle", "", "_args"];
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);
};
2 changes: 1 addition & 1 deletion addons/aircraft/functions/fnc_droneGetTurretTargetPos.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* Public: No
*/

params ["_vehicle"];
private _turret = [0];
TRACE_2("droneGetTurretTargetPos",_vehicle,_turret);
Expand Down
4 changes: 2 additions & 2 deletions addons/arsenal/functions/fnc_handleStats.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -186,7 +186,7 @@ private _fnc_handleStats = {
_statsTextCtrl
];
};

{
_x ctrlCommit 0;
} forEach [
Expand Down
2 changes: 1 addition & 1 deletion addons/attach/functions/fnc_placeApprove.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion addons/casings/functions/fnc_createCasing.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions addons/compat_rf/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions addons/concertina_wire/data/model.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CfgSkeletons {
class CfgSkeletons {
class Default {
isDiscrete = 1;
skeletonInherit = "";
Expand Down Expand Up @@ -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 {};
Expand All @@ -232,7 +232,7 @@ class CfgModels {
maxValue = 90;
angle0="rad 0";
angle1="rad +90";
};
};
class extract_1 {
type = "translation";
source = "";
Expand Down
1 change: 0 additions & 1 deletion addons/csw/data/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ class CfgModels {
skeletonName = "ACE_CSW_mortarBaseplate_Skeleton";
};
};

2 changes: 1 addition & 1 deletion addons/csw/functions/fnc_getUnloadActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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)}
};
Expand Down
4 changes: 2 additions & 2 deletions addons/dogtags/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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, ""];
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions addons/dragging/anim/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -116,4 +116,3 @@ class cfgSkeletons {
pivotsModel="A3\anims_f\data\skeleton\SkeletonPivots.p3d";
};
};

4 changes: 2 additions & 2 deletions addons/dragon/models/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class CfgSkeletons {
skeletonInherit = "";
skeletonBones[] = {};
};

class ace_m47_static_skeleton: Default {
skeletonInherit = "Default";
skeletonBones[] = {
Expand All @@ -22,7 +22,7 @@ class CfgModels {
sectionsInherit = "";
sections[] = {};
};

class ace_m47_static: Default {
sectionsInherit = "Default";
sections[] = {};
Expand Down
2 changes: 1 addition & 1 deletion addons/explosives/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
4 changes: 2 additions & 2 deletions addons/explosives/functions/fnc_addDetonateActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion addons/fastroping/anim/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/field_rations/anim/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions addons/fortify/functions/fnc_addActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/gestures/anim/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/goggles/anim/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/gunbag/data/model.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions addons/hellfire/functions/fnc_attackProfile.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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"];

Expand Down Expand Up @@ -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);
};
Expand Down
2 changes: 1 addition & 1 deletion addons/hitreactions/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions addons/interaction/functions/fnc_addSquadChildren.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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"];

Expand Down
2 changes: 1 addition & 1 deletion addons/laser/functions/fnc_addMapHandler.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down
6 changes: 3 additions & 3 deletions addons/laser/functions/fnc_keyLaserCodeChange.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading