Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed all spaces from macros

Browse Source
This commit is contained in:
lambdatiger 2024-02-08 17:12:11 -06:00
parent 60543a5f59
commit 2ad2564a1e
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/functions/fnc_dev_fired.sqf
View File

@ -16,6 +16,6 @@
*/
//IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile, _vehicle, _gunner, _turret);
TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_vehicle,_gunner,_turret);
[_projectile, true, [side group _unit, side group ACE_player] call BIS_fnc_sideIsFriendly] call FUNC(dev_addRound);

5
addons/frag/functions/fnc_doFragTargeted.sqf
View File

@ -43,6 +43,9 @@ if (_fragTypes isEqualTo []) then {
];
};
// Post 2.18 change - uncomment line 47, remove line 49, 56-62, 70-72, and change lines 64 & 170 from _targetse to _objects
// private _objects = [ASLToAGL _posASL, _fragRange, _fragRange, 0, false, _fragRange ] nearEntities [["Car", "Motorcycle", "Tank", "StaticWeapon", "CAManBase", "Air", "Ship"], false, true, true];
private _objects = (ASLToATL _posASL) nearEntities [["Car", "Motorcycle", "Tank", "StaticWeapon", "CAManBase", "Air", "Ship"], _fragRange];
if (_objects isEqualTo []) exitWith {
TRACE_2("No nearby targets",_posASL,_fragRange);
@ -161,7 +164,7 @@ private _totalFragCount = 0;
_totalFragCount = _totalFragCount + _fragCount;
if (_totalFragCount >= _maxFrags) then {
TRACE_2("maxFrags", _totalFragCount, _maxFrags);
TRACE_2("maxFrags",_totalFragCount,_maxFrags);
break;
};
} forEach _targets;

2
addons/frag/functions/fnc_getFragInfo.sqf
View File

@ -98,7 +98,7 @@ if (_warn) then {
* of spherical fragmentation
*/
_ammoInfo = [
sqrt (_fragCount / (4 * pi * ACE_FRAG_MIN_FRAG_HIT_CHANCE)),
ACE_FRAG_MAX_FRAG_RANGE max sqrt (_fragCount / (4 * pi * ACE_FRAG_MIN_FRAG_HIT_CHANCE)),
0.8 * _gurneyConstant * sqrt (_chargeMass / (_metalMass + _chargeMass * _geometryCoefficient)),
_fragTypes,
_fragCount / 4 / pi

8
addons/frag/functions/fnc_initBlackList.sqf
View File

@ -15,13 +15,13 @@
* Public: No
*/
TRACE_1("Beginning blacklist init", GVAR(blackList));
TRACE_1("Beginning blacklist init",GVAR(blackList));
// could improve text parsing of CBA setting string
private _convArray = parseSimpleArray GVAR(blackList);
if (_convArray isEqualTo []) exitWith {
TRACE_1("Empty blacklist", _convArray);
TRACE_1("Empty blacklist",_convArray);
};
// Add CBA setting blacklist to blacklist and log errors
@ -29,13 +29,13 @@ private _errors = 0;
{
private _ammo = _x;
if !(_ammo isEqualType "") then {
INFO_1("Improper ammo string at index %1", _forEachIndex);
INFO_1("Improper ammo string at index %1",_forEachIndex);
INC(_errors);
continue;
};
if (!isClass (configFile >> "CfgAmmo" >> _ammo)) then {
INFO_1("Ammo class: %1 does not exist", str _ammo);
INFO_1("Ammo class: %1 does not exist",str _ammo);
INC(_errors);
continue;
};

2
addons/frag/functions/fnc_shouldFrag.sqf
View File

@ -33,7 +33,7 @@ private _indirectRange = getNumber (_ammoConfig >> "indirectHitRange");
if (_skip == 1 || (_force == 0 && {_explosive < 0.5 || {_indirectHit < 3
|| {_indirectRange < 5 && _indirectHit < _indirectRange}}})) then {
TRACE_5("No frag",_ammo,_skip, _explosive, _indirectRange, _indirectHit);
TRACE_5("No frag",_ammo,_skip,_explosive,_indirectRange,_indirectHit);
_shouldFrag = false;
};