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

"isNotSpectator" canInteractWith condition

Browse Source
This commit is contained in:
SilentSpike 2015-07-04 19:41:18 +01:00
parent 975bc229c6
commit c09314027f
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/spectator/XEH_postInit.sqf
View File

@ -22,6 +22,9 @@
if !(hasInterface) exitWith {};
// Add interaction menu exception
["isNotSpectating", {!((_this select 0) getVariable [QGVAR(isSpectator), false])}] call EFUNC(common,addCanInteractWithCondition);
GVAR(playerSide) = side (group player);
if GVAR(tracking) then {

6
addons/spectator/functions/fnc_camera.sqf
View File

@ -187,10 +187,6 @@ switch _mode do {
EGVAR(nametags,showNamesForAI) = false;
};
if (["ace_interact_menu"] call EFUNC(common,isModLoaded)) then {
[QGVAR(interactCondition), {false}] call EFUNC(common,addCanInteractWithCondition);
};
//add unit check, since if tracking were on it would already be present
if !GVAR(tracking) then {
[FUNC(checkUnits), 2] call CBA_fnc_addPerFrameHandler
@ -803,4 +799,4 @@ switch _mode do {
if (!isMultiplayer) then {setAccTime 1};
ACE_player switchCamera "Internal";
};
};
};

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

@ -24,18 +24,16 @@ _set = if (count _this > 2) then {_this select 2} else {true};
if (_set isEqualTo (_unit getVariable [QGVAR(isSpectator), false])) exitWith {};
// Spectators aren't physical entities (todo: this command has to be executed on the server)
_unit hideObjectGlobal _set;
// Prevent player falling into water
_unit enableSimulation !_set;
if (_set) then {
// Move the player ASAP to avoid being seen
// Move and hide the player ASAP to avoid being seen
_unit setPosASL (getMarkerPos QGVAR(respawn));
[_unit] joinSilent grpNull;
// Dead men can't talk
// Ghosts can't talk
[_unit, "isSpectator"] call EFUNC(common,hideUnit);
[_unit, "isSpectator"] call EFUNC(common,muteUnit);
if !(GVAR(modulePos)) then {
@ -51,18 +49,19 @@ if (_set) then {
// Code to exit spectator and "respawn" player goes here (WIP)
["Exit"] call FUNC(camera);
// Living men can talk
// Physical beings can talk
[_unit, "isSpectator"] call EFUNC(common,unhideUnit);
[_unit, "isSpectator"] call EFUNC(common,unmuteUnit);
};
// Handle common addon audio
if (isClass (configFile >> "CfgPatches" >> "ace_hearing")) then {EGVAR(hearing,disableVolumeUpdate) = _set};
if (isClass (configFile >> "CfgPatches" >> "acre_sys_radio")) then {[_set] call acre_api_fnc_setSpectator};
if (isClass (configFile >> "CfgPatches" >> "task_force_radio")) then {[_unit, _set] call TFAR_fnc_forceSpectator};
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 (["task_force_radio"] call EFUNC(common,isModLoaded)) then {[_unit, _set] call TFAR_fnc_forceSpectator};
// Spectators ignore damage (vanilla and ace_medical)
_unit allowDamage !_set;
_unit setVariable ["ace_medical_allowDamage", !_set];
_unit setVariable [QGVAR(medical,allowDamage), !_set];
// Mark spectator state for external reference
[_unit,QGVAR(isSpectator),_set] call EFUNC(common,setVariableJIP);