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

player_onPause fixes (#1796)

Browse Source 
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
This commit is contained in:
oiad
2016-11-13 14:56:58 +13:00
committed by ebaydayz
parent 00f1f8537a
commit be1fb51fe8
15 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SQF/dayz_code/compile/player_onPause.sqf
View File

@@ -44,6 +44,7 @@ while {(!isNull _display) && !r_player_dead} do {
case (_inCombat && !_zedCheck && !_playerCheck) : {
_btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)];
[localize "str_abort_playerincombat",1] call dayz_rollingMessages;
};
case (isInTraderCity) : {
_btnAbort ctrlEnable false;
@@ -68,4 +69,4 @@ while {(!isNull _display) && !r_player_dead} do {
};
TimeOutDisplayed = false;
if (r_player_dead) exitWith {_btnAbort ctrlEnable true;};
if (r_player_dead) exitWith {_btnAbort ctrlEnable true;};