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

manual merge

Browse Source
This commit is contained in:
commy2 2015-04-26 21:26:57 +02:00
commit aabe532829
3 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/respawn/functions/fnc_module.sqf
View File

@ -31,21 +31,17 @@ GVAR(Module) = true;
if (isServer) then {
if (GVAR(RemoveDeadBodiesDisconnected)) then {
private "_fnc_deleteDisconnected";
_fnc_deleteDisconnected = {
_this spawn {
addMissionEventHandler ["HandleDisconnect", {
[{
PARAMS_1(_unit);
sleep 4;
if (!alive _unit) then {
deleteVehicle _unit;
};
};
},
_this, 4, 1] call EFUNC(common,waitAndExecute);
false
};
addMissionEventHandler ["HandleDisconnect", _fnc_deleteDisconnected];
}];
};
};

15
addons/respawn/functions/fnc_moveRallypoint.sqf
View File

@ -17,7 +17,6 @@
#include "script_component.hpp"
_this spawn {
PARAMS_2(_unit,_side);
private ["_rallypoint", "_position"];
@ -27,8 +26,8 @@ _this spawn {
_rallypoint = [
objNull,
missionNamespace getVariable ["ACE_Rallypoint_West", objNull],
missionNamespace getVariable ["ACE_Rallypoint_East", objNull],
missionNamespace getVariable ["ACE_Rallypoint_Independent", objNull]
missionNamespace getVariable ["ACE_RallypointExit_East", objNull],
missionNamespace getVariable ["ACE_RallypointExit_Independent", objNull]
] select ([west, east, independent] find _side) + 1;
if (isNull _rallypoint) exitWith {};
@ -41,7 +40,12 @@ _this spawn {
[localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured);
sleep 5;
[{
_rallypoint = _this select 0;
_unit = _this select 1;
_position = _this select 2;
_rallypoint = _this select 3;
_rallypoint setPosATL _position;
_unit reveal _rallypoint;
@ -50,4 +54,5 @@ _this spawn {
["rallypointMoved", [_rallypoint, _side, _position]] call EFUNC(common,globalEvent);
[localize "STR_ACE_Respawn_Deployed"] call EFUNC(common,displayTextStructured);
};
},
[_rallypoint, _unit, _position, _rallypoint], 5, 1] call EFUNC(common,waitAndExecute);

7
addons/respawn/functions/fnc_removeBody.sqf
View File

@ -29,9 +29,8 @@ if (_forceRemove) then {
_bodyRemoveTimer = 2;
};
[_body, _bodyRemoveTimer] spawn {
sleep (_this select 1);
[{
// hideBody takes ~20s till body is fully underground
// a better hideBody would make this more aesthetic
deleteVehicle (_this select 0);
};
deleteVehicle _this;
}, _body, _bodyRemoveTimer, 1] call EFUNC(common,waitAndExecute);