From 04e844fecf017f35da737522fbf0b1287d746602 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Tue, 16 Jul 2024 22:40:13 -0500 Subject: [PATCH] fixed small mistakes in names and function calls --- addons/frag/XEH_PREP.hpp | 1 + addons/frag/XEH_postInit.sqf | 2 +- addons/frag/functions/fnc_doSpallLocal.sqf | 2 +- addons/frag/functions/fnc_fired.sqf | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/frag/XEH_PREP.hpp b/addons/frag/XEH_PREP.hpp index 4378b6a5b0..7af205aa8e 100644 --- a/addons/frag/XEH_PREP.hpp +++ b/addons/frag/XEH_PREP.hpp @@ -20,5 +20,6 @@ PREP(getMaterialInfo); PREP(getSpallInfo); PREP(getFragInfo); PREP(initMaterialCache); +PREP(roundInitFrag); PREP(shouldFrag); PREP(shouldSpall); diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf index 1b512b201f..47affc9971 100644 --- a/addons/frag/XEH_postInit.sqf +++ b/addons/frag/XEH_postInit.sqf @@ -12,7 +12,7 @@ if (!hasInterface) exitWith {}; ["ace_firedPlayerVehicleNonLocal", LINKFUNC(dev_fired)] call CBA_fnc_addEventHandler; - ["ace_firedNonPlayerVehicle", LINKFUNC(dev_fired)] call CBA_fnc_addEventHandler; + ["ace_firedPlayerNonLocal", LINKFUNC(dev_fired)] call CBA_fnc_addEventHandler; GVAR(dev_drawPFEH) = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler; [ "ace_interact_menu_newControllableObject", diff --git a/addons/frag/functions/fnc_doSpallLocal.sqf b/addons/frag/functions/fnc_doSpallLocal.sqf index 39f85360f3..6e0fd81ca3 100644 --- a/addons/frag/functions/fnc_doSpallLocal.sqf +++ b/addons/frag/functions/fnc_doSpallLocal.sqf @@ -129,6 +129,6 @@ systemChat ("spd: " + str (_speedChange * ACE_FRAG_SPALL_VELOCITY_INHERIT_COEFF) TRACE_5("Calling event:",QUOTE(GLUE(ADDON,_)) + _material + _spawnSize,_lastVelocityNorm,_vectorUp,_speedChange,_shotParents); [ - FUNC(doSpallServer), + QGVAR(spallEvent), [QUOTE(GLUE(ADDON,_)) + _material + _spawnSize, _lastVelocityNorm, _vectorUp, _speedChange, _shotParents] ] call CBA_fnc_serverEvent; diff --git a/addons/frag/functions/fnc_fired.sqf b/addons/frag/functions/fnc_fired.sqf index d94ca518cc..2c5b61d349 100644 --- a/addons/frag/functions/fnc_fired.sqf +++ b/addons/frag/functions/fnc_fired.sqf @@ -57,9 +57,9 @@ if (GVAR(spallEnabled) && {_ammo call FUNC(shouldSpall)}) then { ]; }; if !(GVAR(reflectionsEnabled) || GVAR(enabled)) exitWith { - TRACE_1("initExit No frag/reflections",_ammo); + TRACE_1("firedExit No frag/reflections",_ammo); }; -[_projectile, _ammo] call FUNC(roundInitFrag); +[_ammo, _projectile] call FUNC(roundInitFrag); -TRACE_1("initExit",_ammo); +TRACE_1("firedExit",_ammo);