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

Fixes

Browse Source
This commit is contained in:
vbawol
2013-06-21 22:06:46 -05:00
parent 0ebffc3c8f
commit 181d4b7806
21 changed files with 117 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dayz_code/actions/refuel.sqf
View File

@@ -67,7 +67,7 @@ _availableCans = ["ItemJerrycan","ItemFuelBarrel"];
if (r_interrupt) then {
r_doLoop = false;
};
if (vehicle player == player) then {
if (vehicle player != player) then {
r_doLoop = false;
};
sleep 0.1;

16
dayz_code/compile/player_friendliesCheck.sqf
View File

@@ -21,12 +21,12 @@ _tagList = player getVariable ["tagList", []];
_tag setVariable ["belongsTo", _rcharID];
// Force white
_tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
// _tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
diag_log format["SETUP ORB FOR: %1", _x];
// Maintenance array
_tagList set [count _tagList, [_x, _tag,"white"]];
_tagList set [count _tagList, [_x, _tag,"init"]];
player setVariable ["tagList", _tagList];
};
};
@@ -39,8 +39,8 @@ _newTagList = [];
_tag = _x select 1;
_status = _x select 2;
_statusNew = "white";
//_tagColor = "";
_tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
_tagColor = "";
// _tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
// friendly player disconnected
@@ -49,7 +49,7 @@ _newTagList = [];
} else {
if (_status != "green") then {
diag_log format["CHECK IF FRIENDLY: %1", _player];
//diag_log format["CHECK IF FRIENDLY: %1", _player];
_rcharID = _player getVariable ["characterID", "0"];
_rfriendlies = _player getVariable ["friendlies", []];
_rfriendlyTo = _player getVariable ["friendlyTo", []];
@@ -57,7 +57,7 @@ _newTagList = [];
if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
if (!(_charID in _rfriendlyTo)) then {
diag_log format["IS FRIENDLY: %1", _player];
// diag_log format["IS FRIENDLY: %1", _player];
_rfriendlyTo set [count _rfriendlyTo, _charID];
_player setVariable ["friendlyTo", _rfriendlyTo, true];
@@ -83,7 +83,7 @@ _newTagList = [];
};
};
diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
// diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
};
@@ -95,7 +95,7 @@ _newTagList = [];
};
};
diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
// diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
_newTagList set [count _newTagList, [_player, _tag, _status]];
};
} forEach _tagList;

2
dayz_code/init/compiles.sqf
View File

@@ -124,7 +124,7 @@ if (!isDedicated) then {
_control1 = _display displayctrl 8400;
_control2 = _display displayctrl 102;
// 120 sec timeout
while { _timeOut < 3000 && !dayz_clientPreload && !dayz_authed } do {
while { _timeOut < 1500 && !dayz_clientPreload && !dayz_authed } do {
if ( isNull _display ) then {
waitUntil { !dialog; };

2
dayz_code/stringtable.xml
View File

@@ -2493,7 +2493,7 @@
<Czech>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Czech>
</Key>
<Key ID="STR_FOOD_NAME_OSHERBET">
<Original>Orange Sherbet/Original>
<Original>Orange Sherbet</Original>
<English>Orange Sherbet</English>
<German>Orange Sherbet</German>
<Russian>Orange Sherbet</Russian>