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

Add EH for UAV control, Add Hellfire support #5305

Merged
merged 5 commits into from
Aug 22, 2017
Merged

Add EH for UAV control, Add Hellfire support #5305

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83dd42e
Add EH for UAV control, Add Hellfire support
PabstMirror Jun 22, 2017
c8aea45
cycle guidance keybind
PabstMirror Jun 24, 2017
487df1b
Handle broken PlayerViewChanged
PabstMirror Jun 24, 2017
101f9f4
humps
PabstMirror Jun 26, 2017
9d08a03
UAV Self-interactions (#5379)
tbeswick96 Aug 22, 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
24 changes: 24 additions & 0 deletions addons/common/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,30 @@ GVAR(OldIsCamera) = false;
END_COUNTER(stateChecker);
}, 0.5, []] call CBA_fnc_addPerFrameHandler;

// Add event handler for UAV control change
ACE_controlledUAV = [objnull, objnull, [], ""];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Camel case in objNull.

addMissionEventHandler ["PlayerViewChanged", {
params ["", "", "", "", "", "_UAV"];

private _position = (UAVControl _UAV) param [1, ""];
private _seatAI = objnull;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

private _turret = [];
switch (toLower _position) do {
case ("driver"): {
_turret = [-1];
_seatAI = driver _UAV;
};
case ("gunner"): {
_turret = [0];
_seatAI = gunner _UAV;
};
};

TRACE_5("PlayerViewChanged",_UAV,_seatAI,_turret,_position,ACE_controlledUAV);
ACE_controlledUAV = [_UAV, _seatAI, _turret, _position];
["ACE_controlledUAV", [_UAV, _seatAI, _turret, _position]] call CBA_fnc_localEvent;
}];


//////////////////////////////////////////////////
// Eventhandlers for player controlled machines
Expand Down
9 changes: 9 additions & 0 deletions addons/hellfire/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,13 @@ GVAR(pfID) = -1;
["ace_settingsInitialized", {
["turret", LINKFUNC(showHud), false] call CBA_fnc_addPlayerEventHandler;
["vehicle", LINKFUNC(showHud), true] call CBA_fnc_addPlayerEventHandler; // only one of these needs the retro flag

// Add UAV Control Compatibility
["ACE_controlledUAV", {
params ["_UAV", "_seatAI", "_turret", "_position"];
TRACE_4("ACE_controlledUAV EH",_UAV,_seatAI,_turret,_position);
if (!isNull _seatAI) then {
[_seatAI] call FUNC(showHud);
};
}] call CBA_fnc_addEventHandler;
}] call CBA_fnc_addEventHandler;
16 changes: 11 additions & 5 deletions addons/laser/functions/fnc_keyLaserCodeChange.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ if ((!alive ACE_player) || {!([ACE_player, vehicle ACE_player, []] call EFUNC(co
private _currentShooter = objNull;
private _currentWeapon = "";

if (ACE_player call CBA_fnc_canUseWeapon) then {
_currentShooter = ACE_player;
_currentWeapon = currentWeapon ACE_player;
if (isNull (ACE_controlledUAV param [0, objNull])) then {
if (ACE_player call CBA_fnc_canUseWeapon) then {
_currentShooter = ACE_player;
_currentWeapon = currentWeapon ACE_player;
} else {
_currentShooter = vehicle ACE_player;
private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
_currentWeapon = _currentShooter currentWeaponTurret _turretPath;
};
} else {
_currentShooter = vehicle ACE_player;
private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
_currentShooter = ACE_controlledUAV select 0;
private _turretPath = ACE_controlledUAV select 2;
_currentWeapon = _currentShooter currentWeaponTurret _turretPath;
};

Expand Down