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

changed params statement, function header, and propigated doFrag argument changes

Browse Source
This commit is contained in:
lambdatiger 2024-01-17 20:46:15 -06:00
parent 3f84a45dee
commit da1d184009
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/frag/functions/fnc_initRound.sqf
View File

@ -1,10 +1,11 @@
#include "..\script_component.hpp" #include "..\script_component.hpp"
/* /*
* Author: Lambda.Tiger * Author: Lambda.Tiger
* This function adds rounds using their config init EH. * This function adds projectile explode and hitPart event handlers and is
* intended to be called from an projectile config init event handler.
*
* Arguments: * Arguments:
* 0: Projectile <OBJECT> - The object created * 0: The projectile to be initialized <OBJECT>
* *
* Return Value: * Return Value:
* None * None
@ -16,9 +17,7 @@
*/ */
TRACE_1("ACE_Frag rndInit",_this); TRACE_1("ACE_Frag rndInit",_this);
params [ params ["_projectile"];
["_projectile", objNull, [objNull]]
];
if !(isServer) exitWith {}; if !(isServer) exitWith {};
@ -31,13 +30,13 @@ if (GVAR(enabled) && {_ammo call FUNC(shouldFrag)}) then {
_projectile addEventHandler [ _projectile addEventHandler [
"Explode", "Explode",
{ {
params ["_proj", "_posASL"]; params ["_proj", "_posASL", "_velocity"];
private _shotParents = getShotParents _proj; private _shotParents = getShotParents _proj;
private _ammo = typeOf _proj; private _ammo = typeOf _proj;
// wait for frag damage to kill units before spawning fragments // wait for frag damage to kill units before spawning fragments
[ [
FUNC(doFrag), FUNC(doFrag),
_this + [_ammo, _shotParents] [_posASL, _velocity, _ammo, _shotParents]
] call CBA_fnc_execNextFrame; ] call CBA_fnc_execNextFrame;
if (GVAR(reflectionsEnabled)) then { if (GVAR(reflectionsEnabled)) then {
[_posASL, _ammo] call FUNC(doReflections); [_posASL, _ammo] call FUNC(doReflections);
@ -73,8 +72,4 @@ if (GVAR(debugOptions) && (_shouldFrag || _shouldSpall)) then {
[_projectile, "red", true] call FUNC(dev_trackObj); [_projectile, "red", true] call FUNC(dev_trackObj);
}; };
#endif #endif
#ifdef DEBUG_MODE_FULL TRACE_1("initExit",_ammo);
private _shouldSpall = _ammo call FUNC(shouldSpall);
private _shouldFrag = _ammo call FUNC(shouldFrag)
#endif
TRACE_2("initExit",_shouldFrag,_shouldSpall);