sync with DayZ 1.7.4 CE

This commit is contained in:
Aaron Clark
2012-11-10 08:02:49 -06:00
parent e9e55f912b
commit 039f1eb8da
36 changed files with 921 additions and 518 deletions

View File

@@ -21,12 +21,10 @@ private["_unit","_magazine","_used","_quantity","_magsNet","_magsWhole","_key","
// Both the firer and those nearby (<=15m) go into "combat" to prevent ALT-F4
_firer setVariable["startcombattimer", 1, true];
_listNear = _firer nearEntities [["CAManBase","AllVehicles"],15];
{
if (_isPlayer) then {
if (_distance <= 15) then {
_unit setVariable["startcombattimer", 1, true];
};
} forEach _listNear;
if (_inVehicle) exitWith{};
if (_firer == player) exitWith{};