From 67ede7649468ab6edda16a2b9ccfc6e2cda56883 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Mon, 15 Jan 2024 19:57:31 -0600 Subject: [PATCH] compacted text a bit --- addons/frag/XEH_postInit.sqf | 1 - addons/frag/XEH_preInit.sqf | 3 --- addons/frag/functions/fnc_addBlackList.sqf | 1 - addons/frag/functions/fnc_dev_fragCalcDump.sqf | 2 -- addons/frag/functions/fnc_dev_switchUnitHandle.sqf | 1 - addons/frag/functions/fnc_doFragTargeted.sqf | 6 +----- addons/frag/functions/fnc_doSpall.sqf | 2 -- addons/frag/functions/fnc_initRound.sqf | 2 -- addons/frag/initSettings.inc.sqf | 1 - 9 files changed, 1 insertion(+), 18 deletions(-) diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf index f431919de6..b6afbf66ed 100644 --- a/addons/frag/XEH_postInit.sqf +++ b/addons/frag/XEH_postInit.sqf @@ -24,7 +24,6 @@ } ] call CBA_fnc_addEventHandler; - #ifdef LOG_FRAG_INFO [true, true, 30] call FUNC(dev_debugAmmo); #endif diff --git a/addons/frag/XEH_preInit.sqf b/addons/frag/XEH_preInit.sqf index abfa726271..99bb1e830b 100644 --- a/addons/frag/XEH_preInit.sqf +++ b/addons/frag/XEH_preInit.sqf @@ -6,7 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; - GVAR(spallMaterialCache) = createHashMap; GVAR(spallInfoCache) = createHashMap; GVAR(shouldSpallCache) = createHashMap; @@ -16,7 +15,6 @@ GVAR(shouldFragCache) = createHashMap; GVAR(fragInfoCache) = createHashMap; GVAR(lastFragTime) = -2; - #include "initSettings.inc.sqf" #ifdef DEBUG_MODE_DRAW @@ -28,5 +26,4 @@ GVAR(dev_drawPFEH) = -1; #include "initSettingsDebug.inc.sqf" #endif - ADDON = true; diff --git a/addons/frag/functions/fnc_addBlackList.sqf b/addons/frag/functions/fnc_addBlackList.sqf index 1c54f7c0a9..86ac77de0f 100644 --- a/addons/frag/functions/fnc_addBlackList.sqf +++ b/addons/frag/functions/fnc_addBlackList.sqf @@ -18,7 +18,6 @@ params ["_projectile"]; TRACE_1("addBlackList",_round); - if (_projectile isEqualType objNull) then { _projectile = typeOf _projectile; }; diff --git a/addons/frag/functions/fnc_dev_fragCalcDump.sqf b/addons/frag/functions/fnc_dev_fragCalcDump.sqf index 14cc43354d..dbfc87f793 100644 --- a/addons/frag/functions/fnc_dev_fragCalcDump.sqf +++ b/addons/frag/functions/fnc_dev_fragCalcDump.sqf @@ -22,7 +22,6 @@ params [ ["_logAll", false, [false]] ]; - private _allAmmoConfigs = configProperties [configFile >> "cfgAmmo", "isClass _x && !('ace_frag' in configName _x)", true]; private _processedCfgAmmos = []; @@ -36,7 +35,6 @@ diag_log text "//****************** fragCalcDump Beg ******************//"; continue }; - private _shouldFrag = [_ammo] call FUNC(shouldFrag); if (_nSkip || _logAll) then { private _fragInfo = [_ammo] call FUNC(getFragInfo); diff --git a/addons/frag/functions/fnc_dev_switchUnitHandle.sqf b/addons/frag/functions/fnc_dev_switchUnitHandle.sqf index d2aed63c45..efd321e197 100644 --- a/addons/frag/functions/fnc_dev_switchUnitHandle.sqf +++ b/addons/frag/functions/fnc_dev_switchUnitHandle.sqf @@ -27,7 +27,6 @@ if (!local _currentUnit) exitWith { ] call CBA_fnc_waitUntilAndExecute; }; - private _actionID = missionNamespace getVariable [QGVAR(dev_clearTraceAction), -1]; if (_actionID > -1 && {!isNull _lastUnit}) then { _lastUnit removeAction _actionID; diff --git a/addons/frag/functions/fnc_doFragTargeted.sqf b/addons/frag/functions/fnc_doFragTargeted.sqf index 60723d2ed9..bc415923bc 100644 --- a/addons/frag/functions/fnc_doFragTargeted.sqf +++ b/addons/frag/functions/fnc_doFragTargeted.sqf @@ -49,7 +49,6 @@ if (_objects isEqualTo []) exitWith { 0; }; - // grab crews and add them in so that targets stay approx. sorted by distance { private _crew = crew _x; @@ -74,7 +73,7 @@ private _totalFragCount = 0; }; private _target = _x; - #ifdef DEBUG_MODE_DRAWFRAG + #ifdef DEBUG_MODE_DRAW [_target, false] call FUNC(dev_trackHitBox); #endif @@ -99,9 +98,6 @@ private _totalFragCount = 0; _height = _dims#2; }; - - - private _distance = _target distance _posASL; // calculate chance to be hit by a fragment diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index 64c040b3ba..152533bfd5 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -61,12 +61,10 @@ private _velocityChange = vectorMagnitude _lastVelocity - vectorMagnitude _vel; private _spallPower = (ACE_FRAG_ROUND_COEF * _caliber * sqrt _velocityChange + _explosive * _indirectHit) * GVAR(spallIntensity); TRACE_3("found speed",_velocityChange,_caliber,_spallPower); - if (_spallPower < 2) exitWith { TRACE_1("lowImpulse",_ammo); }; - private _lastVelocityUnit = vectorNormalized _lastVelocity; private _deltaStep = _lastVelocityUnit vectorMultiply 0.05; diff --git a/addons/frag/functions/fnc_initRound.sqf b/addons/frag/functions/fnc_initRound.sqf index 4c4f41f19e..cfbeb21d21 100644 --- a/addons/frag/functions/fnc_initRound.sqf +++ b/addons/frag/functions/fnc_initRound.sqf @@ -19,7 +19,6 @@ params [ ["_projectile", objNull, [objNull]] ]; - private _ammo = typeOf _projectile; if (_ammo isEqualTo "" || {isNull _projectile}) exitWith { TRACE_2("bad ammo or projectile",_ammo,_projectile); @@ -45,7 +44,6 @@ if (_shouldFrag && GVAR(enabled)) then { ]; }; - private _shouldSpall = _ammo call FUNC(shouldSpall); if (GVAR(spallEnabled) && {_shouldSpall}) then { _projectile addEventHandler [ diff --git a/addons/frag/initSettings.inc.sqf b/addons/frag/initSettings.inc.sqf index 0e14fe4daf..65812ec89e 100644 --- a/addons/frag/initSettings.inc.sqf +++ b/addons/frag/initSettings.inc.sqf @@ -16,7 +16,6 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)]; 1 ] call CBA_fnc_addSetting; - [ QGVAR(reflectionsEnabled), "CHECKBOX", [LSTRING(EnableReflections), LSTRING(EnableReflections_Desc)],