W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
icomrade
2017-01-21 22:41:12 -05:00
parent fc99604108 94f342e7b6
commit b48a0ae2cf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/medical/setup_functions_med.sqf
View File

@@ -296,6 +296,8 @@ fnc_usec_damageBleed = {
private["_wound","_modelPos","_point","_source"]; private["_wound","_modelPos","_point","_source"];
_unit = _this select 0; _unit = _this select 0;
_wound = _this select 1; _wound = _this select 1;
_point = objNull;
_source = objNull;
//_injury = _this select 2; // not used. damage% ??? //_injury = _this select 2; // not used. damage% ???
if (isServer) exitWith{}; // no graphical effects on server! if (isServer) exitWith{}; // no graphical effects on server!

2
SQF/dayz_code/system/scheduler/sched_towngenerator.sqf
View File

@@ -162,7 +162,7 @@ sched_townGenerator = {
_position = _x select 2; _position = _x select 2;
_blocked = false; _blocked = false;
{ {
if (_position distance _x < 150 && {_x select 1 != "waterHoleProxy"}) exitWith { if (_position distance _x < 150) exitWith {
_blocked = true; _blocked = true;
}; };
} forEach dayz_townGeneratorBlackList; } forEach dayz_townGeneratorBlackList;