From 5df635cd6181c81c8a4737683fed77efe5266764 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Mon, 29 Jul 2024 21:04:36 -0500 Subject: [PATCH] removed _fragCount reference in newly backported debug functions --- addons/frag/functions/fnc_dev_debugAmmo.sqf | 8 +++----- addons/frag/functions/fnc_dev_fragCalcDump.sqf | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/frag/functions/fnc_dev_debugAmmo.sqf b/addons/frag/functions/fnc_dev_debugAmmo.sqf index fae388f1b8..bb692a1e3d 100644 --- a/addons/frag/functions/fnc_dev_debugAmmo.sqf +++ b/addons/frag/functions/fnc_dev_debugAmmo.sqf @@ -29,7 +29,7 @@ params [ diag_log text format ["~~~~~~~~~~~~~Start [%1]~~~~~~~~~~~~~", _this]; if (_csvFormat) then { - diag_log text format ["ammo,gurney_c,gurney_m,gurney_k,gurney_gC,skip,fragCount,Inheritance"]; + diag_log text format ["ammo,gurney_c,gurney_m,gurney_k,gurney_gC,skip,Inheritance"]; }; // Gather all configs, either those that could be created from firing or all classes @@ -91,16 +91,14 @@ private _printCount = 0; if (_k == 0) then {_print = true;}; private _gC = getNumber (_ammoConfig >> QGVAR(gurney_c)); if (_gC == 0) then {_print = true;}; - private _fragCount = getNumber (_ammoConfig >> QGVAR(fragCount)); - if (_fragCount == 0) then {_fragCount = 200; _print = true;}; if (!_printOnlyIncomplete || {_print && _skip != 0}) then { INC(_printCount); if (_csvFormat) then { - diag_log text format ["%7,%1,%2,%3,%4,%5,%6,%9,%8", _c, _m, _k, _gC, _skip, _fragCount, _ammo, [_ammoConfig, true] call BIS_fnc_returnParents, _shouldFrag]; + diag_log text format ["%6,%1,%2,%3,%4,%5,%8,%7", _c, _m, _k, _gC, _skip, _ammo, [_ammoConfig, true] call BIS_fnc_returnParents, _shouldFrag]; } else { diag_log text format ["Ammo [%1] MISSING frag configs:", _ammo]; - diag_log text format ["_c=%1,_m=%2,_k=%3,_gC=%4,_skip=%5,_fragCount=%6,_fragTypes=%7", _c, _m, _k, _gC, _skip, _fragCount, _fragTypes]; + diag_log text format ["_c=%1,_m=%2,_k=%3,_gC=%4,_skip=%5,_fragTypes=%6", _c, _m, _k, _gC, _skip, _fragTypes]; }; }; }; diff --git a/addons/frag/functions/fnc_dev_fragCalcDump.sqf b/addons/frag/functions/fnc_dev_fragCalcDump.sqf index 3812273b3c..6a992f5a7e 100644 --- a/addons/frag/functions/fnc_dev_fragCalcDump.sqf +++ b/addons/frag/functions/fnc_dev_fragCalcDump.sqf @@ -34,8 +34,7 @@ diag_log text "//****************** fragCalcDump Beg ******************//"; _ammo call FUNC(shouldFrag) params ["_shouldFrag"]; if (_shouldFrag || _logAll) then { private _fragInfo = _ammo call FUNC(getFragInfo); - _fragInfo params ["_fragRange", "_fragMaxVelocity", "", "_modifiedFragCount"]; - private _fragCount = 4 * pi * _modifiedFragCount; + _fragInfo params ["_fragRange", "_fragMaxVelocity"]; private _ammoConfig = configFile >> "CfgAmmo" >> _ammo; private _indirectHitRange = getNumber (_ammoConfig >> "indirectHitRange"); private _indirectHit = getNumber (_ammoConfig >> "indirectHit"); @@ -47,7 +46,6 @@ diag_log text "//****************** fragCalcDump Beg ******************//"; diag_log text format [" Frag sqrtPower: %1", _fragPowerSqrt]; diag_log text format [" Frag range: %1", _fragRange]; diag_log text format [" Frag speed range: %1", _fragPowerSpeedRange]; - diag_log text format [" Number frags: %1", _fragCount]; INC(_numberPrinted); };