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

more common code cleanup

Browse Source
This commit is contained in:
commy2 2015-09-21 17:32:21 +02:00
parent 13b487e13b
commit 1a4ebdac51
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/common/XEH_postInit.sqf
View File

@ -273,11 +273,30 @@ GVAR(OldInventoryDisplayIsOpen) = nil; //@todo check this
GVAR(OldZeusDisplayIsOpen) = false; GVAR(OldZeusDisplayIsOpen) = false;
GVAR(OldIsCamera) = false; GVAR(OldIsCamera) = false;
// clean up playerChanged eventhandler from preinit and put it in the same PFH as the other events to reduce overhead and guarantee advantageous execution order
if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
[GVAR(PreInit_playerChanged_PFHID)] call CBA_fnc_removePerFrameHandler;
GVAR(PreInit_playerChanged_PFHID) = nil;
};
// PFH to raise varios events // PFH to raise varios events
[{ [{
BEGIN_COUNTER(stateChecker); BEGIN_COUNTER(stateChecker);
private "_data"; // reuse one variable to reduce number of variables that have to be set to private each frame private "_data"; // reuse one variable to reduce number of variables that have to be set to private each frame
// "playerChanged" event
_data = call FUNC(player);
if !(_data isEqualTo GVAR(OldPlayerVehicle)) then {
private "_oldPlayer";
_oldPlayer = ACE_player;
ACE_player = _data;
uiNamespace setVariable ["ACE_player", _data];
// Raise ACE event locally
["playerChanged", [ACE_player, _oldPlayer]] call FUNC(localEvent);
};
// "playerVehicleChanged" event // "playerVehicleChanged" event
_data = vehicle ACE_player; _data = vehicle ACE_player;
if !(_data isEqualTo GVAR(OldPlayerVehicle)) then { if !(_data isEqualTo GVAR(OldPlayerVehicle)) then {

4
addons/common/XEH_preInit.sqf
View File

@ -306,11 +306,11 @@ if (isServer) then {
call FUNC(loadSettingsOnServer); call FUNC(loadSettingsOnServer);
}; };
ACE_player = player; ACE_player = objNull;
if (hasInterface) then { if (hasInterface) then {
// PFH to update the ACE_player variable // PFH to update the ACE_player variable
[{ GVAR(PreInit_playerChanged_PFHID) = [{
if !(ACE_player isEqualTo (call FUNC(player))) then { if !(ACE_player isEqualTo (call FUNC(player))) then {
private ["_oldPlayer"]; private ["_oldPlayer"];
_oldPlayer = ACE_player; _oldPlayer = ACE_player;