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

Replace Spawn/Sleep in attach

Browse Source
This commit is contained in:
PabstMirror 2015-01-13 03:06:24 -06:00
parent 252b9f6790
commit 073805148b
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/attach/XEH_preInit.sqf
View File

@ -4,4 +4,5 @@ PREP(attach);
PREP(canAttach);
PREP(canDetach);
PREP(detach);
PREP(detachDelayFix);
PREP(openAttachUI);

19
addons/attach/functions/fnc_detach.sqf
View File

@ -16,6 +16,7 @@ private ["_unit", "_itemName", "_count", "_attachedItem"];
_unit = _this select 0;
_itemName = _unit getVariable [QGVAR(ItemName), ""];
_attachedItem = _unit getVariable [QGVAR(Item), objNull];
// Check if unit has an attached item
if (_itemName == "") exitWith {};
@ -29,19 +30,13 @@ if ((count items _unit) + (count magazines _unit) <= _count) exitWith {
if (_itemName == "B_IR_Grenade" or _itemName == "O_IR_Grenade" or _itemName == "I_IR_Grenade") then {
// Hack for dealing with X_IR_Grenade effect not dissapearing on deleteVehicle
[_unit getVariable QGVAR(Item), _unit] spawn {
_attachedItem = _this select 0;
_unit = _this select 1;
detach _attachedItem;
_attachedItem setPos [getPos _unit select 0, getPos _unit select 1, (getPos _unit select 2) -1000];
sleep 0.5;
deleteVehicle _attachedItem;
};
}
else
{
detach _attachedItem;
_attachedItem setPos [getPos _unit select 0, getPos _unit select 1, ((getPos _unit select 2) - 1000)];
// Delete attached item after 0.5 seconds
[FUNC(detachFix), 0.5, [_attachedItem, (time + 0.5)]] call CBA_fnc_addPerFrameHandler;
} else {
// Delete attached item
deleteVehicle (_unit getVariable QGVAR(Item));
deleteVehicle _attachedItem;
};
// Reset unit variables

22
addons/attach/functions/fnc_detachDelayFix.sqf Normal file
View File

@ -0,0 +1,22 @@
/*
Name: ACE_attach_fnc_detachFix
Author: Pabst Mirror
Description:
Waits then deletes the object. Fixes IR_Grenade's effect not disapearing.
Parameters:
0: ARRAY - [OBJECT - item, NUMBER - time to wait until]
1: NUMBER - CBA's PerFrameHandler ID
*/
_attachedItem = (_this select 0) select 0;
_waitUntilTime = (_this select 0) select 1;
if (time < _waitUntilTime) exitWith {};
deleteVehicle _attachedItem;
//Remove the frame handler
[(_this select 1)] call cba_fnc_removePerFrameHandler;