Przeglądaj źródła

Change to global event, exit inside the event if not local

m3ales 4 lat temu
rodzic
commit
0a3077279b

+ 5 - 0
addons - Copy/RD501_Main/functions/external_reload/fnc_onReloadExternalHandler.sqf

@@ -1,5 +1,10 @@
 params ["_target", "_magazine", "_ammoAmount"];
+
 {
+	_turret = _target turretLocal _x;
+	if(isNil {_turret}) exitWith {
+		diag_log format["Turret is not local %1", _target];
+	};
 	_target removeMagazinesTurret [_magazine, _x];
 	_target addMagazineTurret [_magazine, _x, _ammoAmount];
 } forEach allTurrets _target;

+ 1 - 1
addons - Copy/RD501_Main/functions/external_reload/fnc_reloadExternal.sqf

@@ -28,7 +28,7 @@ _magazine = _magazine select 0;
 private _onFinish = {
     (_this select 0) params ["_player", "_target", "_magazine", "_ammoAmount"];
 	[_player, _magazine, _ammoAmount] call ace_common_fnc_removeSpecificMagazine;
-	["rd501_external_reload", [_target, _magazine, _ammoAmount], _target] call CBA_fnc_targetEvent;
+	["rd501_external_reload", [_target, _magazine, _ammoAmount]] call CBA_fnc_globalEvent;
 	[format["Reload Complete"], true, 4, 0] call ace_common_fnc_displayText;
     [_player, "AmovPknlMstpSrasWrflDnon", 1] call ace_common_fnc_doAnimation;
 };