Skip to content

Commit

Permalink
Backwards compatiblity for old ace event
Browse files Browse the repository at this point in the history
  • Loading branch information
PabstMirror committed Sep 17, 2018
1 parent 3aa74b9 commit 922774d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions addons/common/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,14 @@ TRACE_1("adding unit playerEH to set ace_player",isNull cba_events_oldUnit);
ACE_player = (_this select 0);
}, true] call CBA_fnc_addPlayerEventHandler;

// Backwards compatiblity for old ace event
GVAR(OldIsCamera) = false;
["featureCamera", {
params ["_player", "_cameraName"];
GVAR(OldIsCamera) = _cameraName != "";
["ace_activeCameraChanged", [_player, GVAR(OldIsCamera)]] call CBA_fnc_localEvent;
}, true] call CBA_fnc_addPlayerEventHandler;

// Add event handler for UAV control change
ACE_controlledUAV = [objNull, objNull, [], ""];
addMissionEventHandler ["PlayerViewChanged", {
Expand Down
4 changes: 2 additions & 2 deletions addons/nightvision/functions/fnc_pfeh.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ if ((currentVisionMode ACE_player) != 1) exitWith {
[GVAR(PFID)] call CBA_fnc_removePerFrameHandler;
GVAR(PFID) = -1;
};
if (call CBA_fnc_getActiveFeatureCamera != "") exitWith {
if (EGVAR(common,OldIsCamera)) exitWith {
if (GVAR(running)) then {
TRACE_2("pausing NVG for scripted camera",alive ACE_player,call CBA_fnc_getActiveFeatureCamera);
TRACE_2("pausing NVG for scripted camera",alive ACE_player,EGVAR(common,OldIsCamera));
GVAR(running) = false;
[false] call FUNC(setupDisplayEffects);
};
Expand Down

0 comments on commit 922774d

Please sign in to comment.