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

Merge branch 'release' of https://github.com/acemod/ACE3 into release

Browse Source
This commit is contained in:
jokoho48 2015-09-12 18:13:12 +02:00
commit b2b41ce8af
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
View File

@ -22,7 +22,7 @@ _bloodPressure = if (!alive _target) then {
} else {
[_target] call FUNC(getBloodPressure)
};
_bloodPressure params ["_bloodPressureHigh", "_bloodPressureLow"];
_bloodPressure params [ "_bloodPressureLow", "_bloodPressureHigh"];
_output = "";
_logOutPut = "";
if ([_caller] call FUNC(isMedic)) then {

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]]];
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 {
[["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};
_vision = [-2,-1] select (sunOrMoon < 1);
_pos = (getPosATL _unit) vectorAdd [0,0,5];
// Enter/exit spectator based on the respawn type and whether killed/respawned
if (alive _unit) then {
if (_respawn == 1) then {
[_unit,QGVAR(isSeagull)] call EFUNC(common,hideUnit);
@ -39,6 +41,9 @@ if (alive _unit) then {
[false] call FUNC(setSpectator);
};
} else {
// Negligible respawn delay can result in entering spectator after respawn
if (playerRespawnTime <= 1) exitWith {};
[2,_killer,_vision,_pos,getDir _unit] call FUNC(setCameraAttributes);
[true] call FUNC(setSpectator);
};