Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make use of new mission eh for CBA player eh #574

Merged
merged 3 commits into from
Jan 13, 2017
Merged

make use of new mission eh for CBA player eh #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e595ca
make use of new mission eh for CBA player eh
commy2 Jan 10, 2017
4b102d2
make use of new mission eh for CBA player eh
commy2 Jan 10, 2017
519a5ec
don't delay first execution until after postInit
commy2 Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 45 additions & 12 deletions addons/events/fnc_addPlayerEventHandler.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ if (_id != -1) then {

GVAR(playerEHInfo) pushBack addMissionEventHandler ["EachFrame", {
private _player = call CBA_fnc_currentUnit;
if !(_player isEqualTo GVAR(oldUnit)) then {
[QGVAR(unitEvent), [_player, GVAR(oldUnit)]] call CBA_fnc_localEvent;
GVAR(oldUnit) = _player;
};

private _data = currentWeapon _player;
if !(_data isEqualTo GVAR(oldWeapon)) then {
Expand Down Expand Up @@ -140,12 +136,6 @@ if (_id != -1) then {
};
};

_data = vehicle _player;
if !(_data isEqualTo GVAR(oldVehicle)) then {
GVAR(oldVehicle) = _data;
[QGVAR(vehicleEvent), [_player, _data]] call CBA_fnc_localEvent;
};

_data = _player call CBA_fnc_turretPath;
if !(_data isEqualTo GVAR(oldTurret)) then {
GVAR(oldTurret) = _data;
Expand All @@ -163,13 +153,56 @@ if (_id != -1) then {
GVAR(oldCameraView) = _data;
[QGVAR(cameraViewEvent), [_player, _data]] call CBA_fnc_localEvent;
};
}];

GVAR(playerEHInfo) pushBack addMissionEventHandler ["PlayerViewChanged", {
private _player = call CBA_fnc_currentUnit;

if !(_player isEqualTo GVAR(oldUnit)) then {
[QGVAR(unitEvent), [_player, GVAR(oldUnit)]] call CBA_fnc_localEvent;
GVAR(oldUnit) = _player;
};

private _data = vehicle _player;
if !(_data isEqualTo GVAR(oldVehicle)) then {
GVAR(oldVehicle) = _data;
[QGVAR(vehicleEvent), [_player, _data]] call CBA_fnc_localEvent;
};
}];

GVAR(playerEHInfo) pushBack addMissionEventHandler ["Map", {
params ["_data"]; //visibleMap is updated one frame later

_data = visibleMap;
if !(_data isEqualTo GVAR(oldVisibleMap)) then {
GVAR(oldVisibleMap) = _data;
[QGVAR(visibleMapEvent), [_player, _data]] call CBA_fnc_localEvent;
[QGVAR(visibleMapEvent), [call CBA_fnc_currentUnit, _data]] call CBA_fnc_localEvent;
};
}];

// emulate change to first value from default one frame later
// using spawn-dc to not having to wait for postInit to complete
0 spawn {
{
private _player = call CBA_fnc_currentUnit;

if !(_player isEqualTo GVAR(oldUnit)) then {
[QGVAR(unitEvent), [_player, GVAR(oldUnit)]] call CBA_fnc_localEvent;
GVAR(oldUnit) = _player;
};

private _data = vehicle _player;
if !(_data isEqualTo GVAR(oldVehicle)) then {
GVAR(oldVehicle) = _data;
[QGVAR(vehicleEvent), [_player, _data]] call CBA_fnc_localEvent;
};

_data = visibleMap;
if !(_data isEqualTo GVAR(oldVisibleMap)) then {
GVAR(oldVisibleMap) = _data;
[QGVAR(visibleMapEvent), [_player, _data]] call CBA_fnc_localEvent;
};
} call CBA_fnc_directCall;
};
};

GVAR(playerEHInfo) pushBack [_type, _id];
Expand Down
6 changes: 4 additions & 2 deletions addons/events/fnc_removePlayerEventHandler.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ default {nil};
if (!isNil QGVAR(playerEHInfo)) then {
GVAR(playerEHInfo) deleteAt (GVAR(playerEHInfo) find [_type, _id]);

if (count GVAR(playerEHInfo) == 1) then {
removeMissionEventHandler ["EachFrame", GVAR(playerEHInfo) select 0];
if (count GVAR(playerEHInfo) == 3) then {
removeMissionEventHandler ["EachFrame", GVAR(playerEHInfo) select 0];
removeMissionEventHandler ["PlayerViewChanged", GVAR(playerEHInfo) select 1];
removeMissionEventHandler ["Map", GVAR(playerEHInfo) select 2];
GVAR(playerEHInfo) = nil;
};
};
Expand Down