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

setSpectator correct group handling, disable user input

Browse Source
This commit is contained in:
SilentSpike 2015-07-15 11:48:49 +01:00
parent a02470c341
commit d7cc309591
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/spectator/functions/fnc_setSpectator.sqf
View File

@ -1,5 +1,5 @@
/* /*
* Author: voiper, SilentSpike * Author: SilentSpike
* Sets target unit to the given spectator state * Sets target unit to the given spectator state
* *
* Arguments: * Arguments:
@ -36,10 +36,12 @@ if !(local _unit) exitwith {
// Prevent player falling into water // Prevent player falling into water
_unit enableSimulation !_set; _unit enableSimulation !_set;
// Move to/from group as appropriate
[_unit, _set, QGVAR(isSpectator), side group _unit] call EFUNC(common,switchToGroupSide);
if (_set) then { if (_set) then {
// Move and hide the player ASAP to avoid being seen // Move and hide the player ASAP to avoid being seen
_unit setPosASL (getMarkerPos QGVAR(respawn)); _unit setPosASL (getMarkerPos QGVAR(respawn));
[_unit, true, QGVAR(isSpectator), side group _unit] call EFUNC(common,switchToGroupSide);
// Ghosts can't talk // Ghosts can't talk
[_unit, QGVAR(isSpectator)] call EFUNC(common,hideUnit); [_unit, QGVAR(isSpectator)] call EFUNC(common,hideUnit);
@ -59,14 +61,14 @@ if (_set) then {
[_unit, QGVAR(isSpectator)] call EFUNC(common,unhideUnit); [_unit, QGVAR(isSpectator)] call EFUNC(common,unhideUnit);
[_unit, QGVAR(isSpectator)] call EFUNC(common,unmuteUnit); [_unit, QGVAR(isSpectator)] call EFUNC(common,unmuteUnit);
// Return to previous group
[_unit, false, QGVAR(isSpectator)] call EFUNC(common,switchToGroupSide);
private ["_marker"]; private ["_marker"];
_marker = ["respawn_west","respawn_east","respawn_guerrila","respawn_civilian"] select ([west,east,resistance,civilian] find GVAR(cachedSide)); _marker = ["respawn_west","respawn_east","respawn_guerrila","respawn_civilian"] select ([west,east,resistance,civilian] find (side group _unit));
_unit setPos (getMarkerPos _marker); _unit setPos (getMarkerPos _marker);
}; };
// Enable/disable input as appropriate
[QGVAR(isSpectator), _set] call EFUNC(common,setDisableUserInputStatus);
// Handle common addon audio // Handle common addon audio
if (["ace_hearing"] call EFUNC(common,isModLoaded)) then {EGVAR(hearing,disableVolumeUpdate) = _set}; if (["ace_hearing"] call EFUNC(common,isModLoaded)) then {EGVAR(hearing,disableVolumeUpdate) = _set};
if (["acre_sys_radio"] call EFUNC(common,isModLoaded)) then {[_set] call acre_api_fnc_setSpectator}; if (["acre_sys_radio"] call EFUNC(common,isModLoaded)) then {[_set] call acre_api_fnc_setSpectator};
@ -79,7 +81,7 @@ _unit setVariable [QEGVAR(medical,allowDamage), !_set];
// No theoretical change if an existing spectator was reset // No theoretical change if an existing spectator was reset
if !(_set && (_unit getVariable [QGVAR(isSpectator), false])) then { if !(_set && (_unit getVariable [QGVAR(isSpectator), false])) then {
// Mark spectator state for reference // Mark spectator state for reference
_unit setVariable [QGVAR(isSpectator), _set]; _unit setVariable [QGVAR(isSpectator), _set, true];
["spectatorChanged",[_set]] call EFUNC(common,localEvent); ["spectatorChanged",[_set]] call EFUNC(common,localEvent);
}; };