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

Explosives - Optimize interactEH function (#6406)

Browse Source 
* Optimize explosives interactEH

* Use local player variable and distanceSqr
This commit is contained in:
mharis001 2018-07-13 13:04:55 -04:00 committed by PabstMirror
parent def05b9cf1
commit a84daca959
1 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
addons/explosives/functions/fnc_interactEH.sqf
View File

@ -1,10 +1,10 @@
/* /*
* Author: PabstMirror * Author: PabstMirror, mharis001
* When interact_menu starts rendering (from "interact_keyDown" event) * Dynamically adds "Defuse" actions to nearby mines when interact_menu is opened.
* Add defuse helpers to all nearby mines * Called by the "ace_interactMenuOpened" event.
* *
* Arguments: * Arguments:
* Interact Menu Type (0 - world, 1 - self) <NUMBER> * Interact Menu Type (0 - World, 1 - Self) <NUMBER>
* *
* Return Value: * Return Value:
* None * None
@ -12,61 +12,62 @@
* Example: * Example:
* [0] call ace_explosives_fnc_interactEH * [0] call ace_explosives_fnc_interactEH
* *
* Public: Yes * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"
params ["_interactionType"]; params ["_interactionType"];
TRACE_1("params",_interactionType); TRACE_1("Explosives interactEH",_interactionType);
//Ignore self-interaction menu // Ignore self-interaction menu or mounted vehicle interaction
if (_interactionType != 0) exitWith {}; // For performance reasons only add PFH if player has a defusal kit
//Ignore while mounted: // If player somehow gets a defusal kit during keyDown, they will just have to reopen menu
if ((vehicle ACE_player) != ACE_player) exitWith {}; if (
//Ignore if we don't have defuse kit _interactionType != 0
if (!("ACE_DefusalKit" in (items ACE_player))) exitWith {}; || {vehicle ACE_player != ACE_player}
|| {!("ACE_DefusalKit" in ([ACE_player, false, true, true, true, false] call CBA_fnc_uniqueUnitItems))}
) exitWith {};
[{ [{
params ["_args", "_pfID"]; BEGIN_COUNTER(interactEH);
_args params ["_setPosition", "_addedDefuseHelpers", "_minesHelped"]; params ["_args", "_pfhID"];
_args params ["_setPosition", "_addedHelpers", "_minesHelped"];
if (!EGVAR(interact_menu,keyDown)) then { if (!EGVAR(interact_menu,keyDown)) then {
TRACE_1("Cleaning Defuse Helpers",(count _addedDefuseHelpers)); TRACE_1("Cleaning defuse helpers",count _addedHelpers);
{deleteVehicle _x;} forEach _addedDefuseHelpers; {deleteVehicle _x} forEach _addedHelpers;
[_pfID] call CBA_fnc_removePerFrameHandler; [_pfhID] call CBA_fnc_removePerFrameHandler;
} else { } else {
// Prevent Rare Error when ending mission with interact key down: // Prevent Rare Error when ending mission with interact key down:
if (isNull ace_player) exitWith {}; private _player = ACE_player;
if (isNull _player) exitWith {};
private _playerPos = getPosASL _player;
//If player moved >5 meters from last pos, then rescan // Rescan if player has moved more than 5 meters from last position
if (((getPosASL ace_player) distance _setPosition) > 5) then { if (_playerPos distanceSqr _setPosition > 25) then {
private _cfgAmmo = configFile >> "CfgAmmo";
{ {
if (((_x distance ACE_player) < 15) && {!(_x in _minesHelped)} && {(getModelInfo _x) select 0 != "empty.p3d"}) then { if (_x distanceSqr _player < 225 && {!(_x in _minesHelped)} && {!(getModelInfo _x select 0 isEqualTo "empty.p3d")}) then {
private _config = _cfgAmmo >> typeOf _x;
private _config = configFile >> "CfgAmmo" >> typeOf _x;
private _size = getNumber (_config >> QGVAR(size)); private _size = getNumber (_config >> QGVAR(size));
TRACE_3("Making Defuse Helper",(_x),(typeOf _x),(_size == 1)); private _defuseClass = ["ACE_DefuseObject", "ACE_DefuseObject_Large"] select (_size == 1);
private _defuseHelper = objNull; private _defusePos = getArray (_config >> QGVAR(defuseObjectPosition));
if (_size == 1) then { if (_defusePos isEqualTo []) then {
_defuseHelper = "ACE_DefuseObject_Large" createVehicleLocal (getPos _x); _defusePos = [0, 0, 0];
} else {
_defuseHelper = "ACE_DefuseObject" createVehicleLocal (getPos _x);
}; };
private _defuseObjectPosition = getArray (_config >> QGVAR(defuseObjectPosition)); TRACE_4("Creating defuse helper",_x,typeOf _x,_defuseClass,_defusePos);
if (_defuseObjectPosition isEqualTo []) then { private _helper = _defuseClass createVehicleLocal [0, 0, 0];
_defuseObjectPosition = [0,0,0];
};
TRACE_1("DefuseObjectPosition",(_defuseObjectPosition)); _helper attachTo [_x, _defusePos];
_helper setVariable [QGVAR(Explosive), _x];
_defuseHelper attachTo [_x, _defuseObjectPosition]; _addedHelpers pushBack _helper;
_defuseHelper setVariable [QGVAR(Explosive),_x];
_addedDefuseHelpers pushBack _defuseHelper;
_minesHelped pushBack _x; _minesHelped pushBack _x;
}; };
} forEach allMines; } forEach allMines;
_args set [0, (getPosASL ace_player)];
_args set [0, _playerPos];
}; };
}; };
}, 0.5, [((getPosASL ace_player) vectorAdd [-100,0,0]), [], []]] call CBA_fnc_addPerFrameHandler; END_COUNTER(interactEH);
}, 0.5, [getPosASL ACE_player vectorAdd [-100, 0, 0], [], []]] call CBA_fnc_addPerFrameHandler;