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

reformatted comments and some v2.18 remakrs comments

Browse Source
This commit is contained in:
lambdatiger 2024-03-02 23:55:32 -06:00
parent ff98917639
commit 4583a0dc9c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,9 @@ TRACE_1("begin doFrag",_this);
params ["_posASL", "_velocity", "_ammo", "_shotParents"]; params ["_posASL", "_velocity", "_ammo", "_shotParents"];
// Don't let a single object cause all fragmentation events // Don't let a single object cause all fragmentation events
_shotParents params ["_shotParentVehicles"]; _shotParents params ["_shotParentVehicle"];
if (_shotParentVehicles getVariable [QGVAR(obj_nextFragTime), -1] > CBA_missionTime) exitWith { if (_shotParentVehicle getVariable [QGVAR(obj_nextFragTime), -1] > CBA_missionTime) exitWith {
TRACE_1("vehicleTimeExit",_shotParentVehicles); TRACE_1("vehicleTimeExit",_shotParentVehicle);
}; };
// Check normal round timeout and adjust _max frags // Check normal round timeout and adjust _max frags
@ -33,7 +33,7 @@ if (_timeSinceLastFrag < ACE_FRAG_HOLDOFF || {_posASL isEqualTo [0, 0, 0]} || {_
TRACE_3("timeExit",_timeSinceLastFrag,CBA_missionTime,GVAR(lastFragTime)); TRACE_3("timeExit",_timeSinceLastFrag,CBA_missionTime,GVAR(lastFragTime));
}; };
TRACE_3("willFrag",_timeSinceLastFrag,CBA_missionTime,_maxFragCount); TRACE_3("willFrag",_timeSinceLastFrag,CBA_missionTime,_maxFragCount);
_shotParentVehicles setVariable [QGVAR(obj_nextFragTime), CBA_missionTime + ACE_FRAG_HOLDOFF_VEHICLE]; _shotParentVehicle setVariable [QGVAR(obj_nextFragTime), CBA_missionTime + ACE_FRAG_HOLDOFF_VEHICLE];
private _maxFragCount = round linearConversion [ACE_FRAG_COUNT_MIN_TIME, ACE_FRAG_COUNT_MAX_TIME, _timeSinceLastFrag, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true]; private _maxFragCount = round linearConversion [ACE_FRAG_COUNT_MIN_TIME, ACE_FRAG_COUNT_MAX_TIME, _timeSinceLastFrag, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true];
[_ammo] call FUNC(getFragInfo) params ["_fragRange", "_fragVel", "_fragTypes", "_modFragCount"]; [_ammo] call FUNC(getFragInfo) params ["_fragRange", "_fragVel", "_fragTypes", "_modFragCount"];

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

@ -171,7 +171,7 @@ private _totalFragCount = 0;
} forEach _targets; } forEach _targets;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat ("targeted frag count: " + str _totalFragCount); systemChat ("targeted frag count: " + str _totalFragCount);
TRACE_1("targeted frag count",_totalFragCount); TRACE_1("targeted frag count",_totalFragCount);
#endif #endif
_totalFragCount _totalFragCount

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

@ -49,6 +49,8 @@ if (GVAR(spallEnabled) && {_ammo call FUNC(shouldSpall)}) then {
"HitPart", "HitPart",
{ {
params ["_projectile", "_hitObject", "", "_posASL", "_velocity", "_surfNorm", "", "", "_surfType"]; params ["_projectile", "_hitObject", "", "_posASL", "_velocity", "_surfNorm", "", "", "_surfType"];
// starting v2.18 it may be faster to use the instigator parameter, the same as the second entry shotParents, to recreate _shotParent
// The "explode" EH does not get the same parameter
private _shotParent = getShotParents _projectile; private _shotParent = getShotParents _projectile;
private _ammo = typeOf _projectile; private _ammo = typeOf _projectile;
private _vectorUp = vectorUp _projectile; private _vectorUp = vectorUp _projectile;