mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
General - Fix case in event handler commands (#10121)
This commit is contained in:
parent
ec5b84c278
commit
66c31928ab
@ -25,7 +25,7 @@ private _hpData = (_hitData select 1) select _hitPartDataIndex;
|
|||||||
private _objectHit = _hpData param [0, objNull];
|
private _objectHit = _hpData param [0, objNull];
|
||||||
TRACE_1("",_objectHit);
|
TRACE_1("",_objectHit);
|
||||||
if ((isNil "_objectHit") || {isNull _objectHit}) exitWith {WARNING_1("Problem with hitPart data - bad object [%1]",_objectHit);};
|
if ((isNil "_objectHit") || {isNull _objectHit}) exitWith {WARNING_1("Problem with hitPart data - bad object [%1]",_objectHit);};
|
||||||
_objectHit removeEventHandler ["hitPart", _hpId];
|
_objectHit removeEventHandler ["HitPart", _hpId];
|
||||||
|
|
||||||
private _caliber = getNumber (configFile >> "CfgAmmo" >> _roundType >> "caliber");
|
private _caliber = getNumber (configFile >> "CfgAmmo" >> _roundType >> "caliber");
|
||||||
private _explosive = getNumber (configFile >> "CfgAmmo" >> _roundType >> "explosive");
|
private _explosive = getNumber (configFile >> "CfgAmmo" >> _roundType >> "explosive");
|
||||||
|
@ -41,7 +41,7 @@ if (!alive _round) exitWith {
|
|||||||
TRACE_1("doSpall",_foundObjectHPIds);
|
TRACE_1("doSpall",_foundObjectHPIds);
|
||||||
{
|
{
|
||||||
if (!isNil "_x") then {
|
if (!isNil "_x") then {
|
||||||
_x removeEventHandler ["hitPart", _foundObjectHPIds select _forEachIndex];
|
_x removeEventHandler ["HitPart", _foundObjectHPIds select _forEachIndex];
|
||||||
};
|
};
|
||||||
} forEach _spallTrack;
|
} forEach _spallTrack;
|
||||||
};
|
};
|
||||||
|
@ -31,7 +31,7 @@ if (_intersectsWith isEqualTo []) exitWith {};
|
|||||||
{
|
{
|
||||||
// diag_log text format ["Adding HP: %1", _x];
|
// diag_log text format ["Adding HP: %1", _x];
|
||||||
private _index = count GVAR(spallHPData);
|
private _index = count GVAR(spallHPData);
|
||||||
private _hpId = _x addEventHandler ["hitPart", compile format ["[%1, _this] call " + QFUNC(spallHP), _index]];
|
private _hpId = _x addEventHandler ["HitPart", compile format ["[%1, _this] call " + QFUNC(spallHP), _index]];
|
||||||
_foundObjects pushBack _x;
|
_foundObjects pushBack _x;
|
||||||
_foundObjectHPIds pushBack _hpId;
|
_foundObjectHPIds pushBack _hpId;
|
||||||
private _data = [_hpId, _x, typeOf _round, _round, _curPos, _velocity, 0, _foundObjects, _foundObjectHPIds];
|
private _data = [_hpId, _x, typeOf _round, _round, _curPos, _velocity, 0, _foundObjects, _foundObjectHPIds];
|
||||||
|
Loading…
Reference in New Issue
Block a user