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

Fix spectator template for negligible respawnDelay

Browse Source 
When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.
This commit is contained in:
SilentSpike 2015-09-12 13:42:31 +01:00
parent e59a4163f7
commit e6c2916a14
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/spectator/functions/fnc_respawnTemplate.sqf
View File

@ -21,15 +21,17 @@
params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]]; params [["_unit",objNull,[objNull]], ["_killer",objNull,[objNull]], ["_respawn",0,[0]], ["_respawnDelay",0,[0]]];
private ["_vision","_pos"]; private ["_vision","_pos"];
// End mission when all are dead with respawn type "None" // When all are dead with respawn type "None" the mission should end
if ((_respawn == 0) && {{alive _x} count allPlayers <= 0}) exitWith { if ((_respawn == 0) && {{alive _x} count allPlayers <= 0}) exitWith {
[["endDeath",false],"BIS_fnc_endMission"] call EFUNC(common,execRemoteFnc); [["endDeath",false],"BIS_fnc_endMission"] call EFUNC(common,execRemoteFnc);
}; };
// Some environment information can be used for the initial camera attributes
if (isNull _killer) then {_killer = _unit}; if (isNull _killer) then {_killer = _unit};
_vision = [-2,-1] select (sunOrMoon < 1); _vision = [-2,-1] select (sunOrMoon < 1);
_pos = (getPosATL _unit) vectorAdd [0,0,5]; _pos = (getPosATL _unit) vectorAdd [0,0,5];
// Enter/exit spectator based on the respawn type and whether killed/respawned
if (alive _unit) then { if (alive _unit) then {
if (_respawn == 1) then { if (_respawn == 1) then {
[_unit,QGVAR(isSeagull)] call EFUNC(common,hideUnit); [_unit,QGVAR(isSeagull)] call EFUNC(common,hideUnit);
@ -39,6 +41,9 @@ if (alive _unit) then {
[false] call FUNC(setSpectator); [false] call FUNC(setSpectator);
}; };
} else { } else {
// Negligible respawn delay can result in entering spectator after respawn
if (playerRespawnTime <= 1) exitWith {};
[2,_killer,_vision,_pos,getDir _unit] call FUNC(setCameraAttributes); [2,_killer,_vision,_pos,getDir _unit] call FUNC(setCameraAttributes);
[true] call FUNC(setSpectator); [true] call FUNC(setSpectator);
}; };