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

should fix #1938

Browse Source 
Also prevents logout on onPause conditions, i.e. logout if in combat, another player is near, or a zombie is near
This commit is contained in:
icomrade
2017-07-25 14:32:49 -04:00
parent db0ef1b744
commit 5acad04c43
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -128,9 +128,9 @@ if (isNil "keyboard_keys") then {
};}; };};
}; };
_forcesave = { _forcesave = {
dayz_lastCheckBit = diag_ticktime; if (diag_tickTime - dayz_lastSave > 10) then {
call player_forceSave; call player_forceSave;
call dayz_EjectPlayer; };
}; };
_forcesave2 = { _forcesave2 = {
if ((!isNull (findDisplay 106)) OR dialog) then { if ((!isNull (findDisplay 106)) OR dialog) then {
@@ -300,7 +300,7 @@ if (isNil "keyboard_keys") then {
[actionKeys "Diary", _journal] call _addArray; [actionKeys "Diary", _journal] call _addArray;
[actionKeys "NetworkStats", _journal] call _addArray; [actionKeys "NetworkStats", _journal] call _addArray;
[[DIK_F1], _muteSound] call _addArray; [[DIK_F1], _muteSound] call _addArray;
//[[DIK_F4, DIK_TAB, DIK_DELETE], _forcesave] call _addArray; [[DIK_F4, DIK_TAB, DIK_DELETE], _forcesave] call _addArray;
//[[DIK_F4, DIK_RMENU, DIK_LMENU,DIK_LSHIFT,DIK_RSHIFT,DIK_ESCAPE], _forcesave2] call _addArray; //[[DIK_F4, DIK_RMENU, DIK_LMENU,DIK_LSHIFT,DIK_RSHIFT,DIK_ESCAPE], _forcesave2] call _addArray;
[actionKeys "LeanLeft", _build_left ] call _addArray; [actionKeys "LeanLeft", _build_left ] call _addArray;
[actionKeys "LeanRight", _build_right ] call _addArray; [actionKeys "LeanRight", _build_right ] call _addArray;

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

@@ -34,16 +34,28 @@ while {(!isNull _display) && !r_player_dead} do {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText]; _btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText];
[localize "str_abort_playerclose",1] call dayz_rollingMessages; [localize "str_abort_playerclose",1] call dayz_rollingMessages;
if (TimeOutDisplayed) then {
_display closeDisplay 2;
closeDialog 2;
};
}; };
case (_zedCheck) : { case (_zedCheck) : {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText]; _btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText];
[localize "str_abort_zedsclose",1] call dayz_rollingMessages; [localize "str_abort_zedsclose",1] call dayz_rollingMessages;
if (TimeOutDisplayed) then {
_display closeDisplay 2;
closeDialog 2;
};
}; };
case (_inCombat) : { case (_inCombat) : {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)]; _btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)];
[localize "str_abort_playerincombat",1] call dayz_rollingMessages; [localize "str_abort_playerincombat",1] call dayz_rollingMessages;
if (TimeOutDisplayed) then {
_display closeDisplay 2;
closeDialog 2;
};
}; };
case (isInTraderCity) : { case (isInTraderCity) : {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;