W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-15 20:52:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update scripts.txt exception

Browse Source
This commit is contained in:
ebayShopper
2017-02-22 19:58:28 -05:00
parent ffb88a0d7b
commit 5a034163af
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/groups/groupMarkers.sqf
View File

@@ -9,7 +9,7 @@ while {true} do {
if (!isNull findDisplay 80000) then {findDisplay 80000 closeDisplay 2;};
localize "STR_EPOCH_RADIO_CONTACT_LOST" call dayz_rollingMessages;
} else {
if (visibleMap or !isNull (uiNameSpace getVariable["BIS_RscMiniMap",displayNull])) then {
if (visibleMap or !isNull (uiNamespace getVariable["BIS_RscMiniMap",displayNull])) then {
_hasGPS = "ItemGPS" in items player;
_markBody = (dayz_markBody == 1 or (dayz_markBody == 2 && _hasGPS));
_markGroup = (dayz_markGroup == 1 or (dayz_markGroup == 2 && _hasGPS));

7
SQF/dayz_code/system/BIS_Effects/init.sqf
View File

@@ -30,7 +30,6 @@ if (isNil "BIS_Effects_Init_DZ") then {
BIS_effects_gepv = _this;
publicVariable "BIS_effects_gepv";
_this call BIS_Effects_startEvent;
};
BIS_Effects_startEvent =
@@ -38,13 +37,13 @@ if (isNil "BIS_Effects_Init_DZ") then {
private "_KillEject";
_KillEject = {
private "_cancel";
if (((vehicle player) == (_this select 0)) && {(vehicle player) != player} && {player in (crew (_This select 0))}) then {
if (((vehicle player) == (_this select 0)) && {(vehicle player) != player} && {player in (crew (_this select 0))}) then {
_cancel = false;
{
if ((isInTraderCity || !canbuild) && {(player distance (_x select 0)) < (_x select 1)}) exitWith {_cancel = true;};
} count DZE_SafeZonePosArray;
player action ["getOut", (_this select 0)];
if (!_cancel && {!((_this select 0) iskindof "car")}) then {
if (!_cancel && !((_this select 0) iskindof "car")) then {
[player, "explosion"] call player_death;
};
};
@@ -73,4 +72,4 @@ if (isNil "BIS_Effects_Init_DZ") then {
}};
(_this select 1) call BIS_Effects_startEvent;
};
};
};