From 6619d55d61e8defe740c72fa3c869798397fc6b7 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 2 Mar 2020 09:24:11 -0600 Subject: [PATCH 1/4] Events - fix loadout player event args --- addons/events/fnc_playerEvent.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/events/fnc_playerEvent.sqf b/addons/events/fnc_playerEvent.sqf index eb740a6a7..2f14e6c0b 100644 --- a/addons/events/fnc_playerEvent.sqf +++ b/addons/events/fnc_playerEvent.sqf @@ -113,7 +113,7 @@ if !(_state isEqualTo GVAR(oldState)) then { } forEach [primaryWeaponMagazine _unit, secondaryWeaponMagazine _unit, handgunMagazine _unit]; if !(_newLoadoutNoAmmo isEqualTo GVAR(oldLoadoutNoAmmo)) then { - [QGVAR(loadoutEvent), [_unit, GVAR(oldLoadout), _newLoadout]] call CBA_fnc_localEvent; + [QGVAR(loadoutEvent), [_unit, _newLoadout, GVAR(oldLoadout)]] call CBA_fnc_localEvent; GVAR(oldLoadoutNoAmmo) = _newLoadoutNoAmmo; }; From 180ab07ae6cf7b879ff01391fd8282e649a52bcb Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 2 Mar 2020 09:34:22 -0600 Subject: [PATCH 2/4] fix retro on featureCamera, group, leader --- addons/events/fnc_addPlayerEventHandler.sqf | 6 +++--- addons/events/fnc_playerEvent.sqf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 0fd53bf1c..3d36c8b41 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -113,7 +113,7 @@ private _id = switch (_type) do { }; case "featurecamera": { if (_applyRetroactively) then { - [GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera] call _function; + [GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera, ""] call _function; }; [QGVAR(featureCameraEvent), _function] call CBA_fnc_addEventHandler // return id }; @@ -125,13 +125,13 @@ private _id = switch (_type) do { }; case "group": { if (_applyRetroactively) then { - [GVAR(oldUnit), group GVAR(oldUnit), grpNull] call _function; + [GVAR(oldUnit), grpNull, group GVAR(oldUnit)] call _function; // intentionally reversed order for backwards compatiblity }; [QGVAR(groupEvent), _function] call CBA_fnc_addEventHandler // return id }; case "leader": { if (_applyRetroactively) then { - [GVAR(oldUnit), leader GVAR(oldUnit), objNull] call _function; + [GVAR(oldUnit), objNull, leader GVAR(oldUnit)] call _function; // intentionally reversed order for backwards compatiblity }; [QGVAR(leaderEvent), _function] call CBA_fnc_addEventHandler // return id }; diff --git a/addons/events/fnc_playerEvent.sqf b/addons/events/fnc_playerEvent.sqf index 2f14e6c0b..0f06a9420 100644 --- a/addons/events/fnc_playerEvent.sqf +++ b/addons/events/fnc_playerEvent.sqf @@ -71,12 +71,12 @@ if !(_state isEqualTo GVAR(oldState)) then { }; if !(_newGroup isEqualTo GVAR(oldGroup)) then { - [QGVAR(groupEvent), [_unit, GVAR(oldGroup), _newGroup]] call CBA_fnc_localEvent; + [QGVAR(groupEvent), [_unit, GVAR(oldGroup), _newGroup]] call CBA_fnc_localEvent; // intentionally reversed order for backwards compatiblity GVAR(oldGroup) = _newGroup; }; if !(_newLeader isEqualTo GVAR(oldLeader)) then { - [QGVAR(leaderEvent), [_unit, GVAR(oldLeader), _newLeader]] call CBA_fnc_localEvent; + [QGVAR(leaderEvent), [_unit, GVAR(oldLeader), _newLeader]] call CBA_fnc_localEvent; // intentionally reversed order for backwards compatiblity GVAR(oldLeader) = _newLeader; }; From 245250bc2d9e9a6ec154fa90f84c86350d82c6b6 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 2 Mar 2020 10:23:00 -0600 Subject: [PATCH 3/4] Update fnc_addPlayerEventHandler.sqf --- addons/events/fnc_addPlayerEventHandler.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 3d36c8b41..02886e710 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -113,7 +113,7 @@ private _id = switch (_type) do { }; case "featurecamera": { if (_applyRetroactively) then { - [GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera, ""] call _function; + [GVAR(oldUnit), GVAR(oldFeatureCamera), GVAR(oldFeatureCamera)] call _function; }; [QGVAR(featureCameraEvent), _function] call CBA_fnc_addEventHandler // return id }; @@ -125,13 +125,13 @@ private _id = switch (_type) do { }; case "group": { if (_applyRetroactively) then { - [GVAR(oldUnit), grpNull, group GVAR(oldUnit)] call _function; // intentionally reversed order for backwards compatiblity + [GVAR(oldUnit), GVAR(oldGroup), GVAR(oldGroup)] call _function; // backwards compatiblity }; [QGVAR(groupEvent), _function] call CBA_fnc_addEventHandler // return id }; case "leader": { if (_applyRetroactively) then { - [GVAR(oldUnit), objNull, leader GVAR(oldUnit)] call _function; // intentionally reversed order for backwards compatiblity + [GVAR(oldUnit), GVAR(oldLeader), GVAR(oldLeader)] call _function; //backwards compatiblity }; [QGVAR(leaderEvent), _function] call CBA_fnc_addEventHandler // return id }; From c4d1d74b8472e026492e79a362c918f712300533 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 2 Mar 2020 10:50:05 -0600 Subject: [PATCH 4/4] fix featurecamera --- addons/events/fnc_addPlayerEventHandler.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 02886e710..d4ea15c35 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -113,7 +113,7 @@ private _id = switch (_type) do { }; case "featurecamera": { if (_applyRetroactively) then { - [GVAR(oldUnit), GVAR(oldFeatureCamera), GVAR(oldFeatureCamera)] call _function; + [GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera] call _function; }; [QGVAR(featureCameraEvent), _function] call CBA_fnc_addEventHandler // return id };