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

Better OnPause

Browse Source
This commit is contained in:
icomrade
2016-09-25 20:31:38 -04:00
parent 7ae35316ed
commit 514ac67650
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
View File

@@ -589,7 +589,7 @@ class RscTitles
class RSC_DZ_Messages { class RSC_DZ_Messages {
idd = 4099999; idd = 4099999;
movingEnable = 0; movingEnable = 0;
fadein = 1; fadein = 0;
fadeout = 5; fadeout = 5;
duration = 6; duration = 6;
onLoad = "uinamespace setvariable ['DZ_Messages',_this select 0]"; onLoad = "uinamespace setvariable ['DZ_Messages',_this select 0]";

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

@@ -26,11 +26,14 @@ while {(!isNull _display) && !r_player_dead} do {
_inCombat = if (_timeout >= diag_tickTime) then {true} else {false}; _inCombat = if (_timeout >= diag_tickTime) then {true} else {false};
_playerCheck = if ({isPlayer _x} count (player nearEntities ["AllVehicles",5]) > 1) then {true} else {false}; _playerCheck = if ({isPlayer _x} count (player nearEntities ["AllVehicles",5]) > 1) then {true} else {false};
_zedCheck = if ((count (player nearEntities ["zZombie_Base",10]) > 0) && !_isPZombie) then {true} else {false}; _zedCheck = if ((count (player nearEntities ["zZombie_Base",10]) > 0) && !_isPZombie) then {true} else {false};
_gearDisplay = findDisplay 106;
if (!isNull _gearDisplay) then {
_gearDisplay closeDisplay 0;
};
switch true do { switch true do {
case (_playerCheck) : { case (_playerCheck) : {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in 30)", _btnAbortText]; _btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText];
[localize "str_abort_playerclose",1] call dayz_rollingMessages; [localize "str_abort_playerclose",1] call dayz_rollingMessages;
}; };
case (_zedCheck) : { case (_zedCheck) : {
@@ -46,25 +49,22 @@ while {(!isNull _display) && !r_player_dead} do {
_btnAbort ctrlEnable false; _btnAbort ctrlEnable false;
[localize "str_epoch_player_12",1] call dayz_rollingMessages; [localize "str_epoch_player_12",1] call dayz_rollingMessages;
}; };
case (((diag_tickTime - _testTime) < 10) && !TimeOutDisplayed) : {
_btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in %2)",_btnAbortText, str(ceil (((_testTime + 10) - diag_tickTime)*10)/10)];
};
default { default {
_gearDisplay = findDisplay 106; if (!TimeOutDisplayed && (!isNull _display)) then {
if (!isNull _gearDisplay) then { TimeOutDisplayed = true;
_gearDisplay closeDisplay 0;
};
if (!TimeOutDisplayed) then {
waitUntil {_btnAbort ctrlSetText format["%1%2%3%4",_btnAbortText," (", str(ceil (((_testTime + 10) - diag_tickTime)*10)/10), ")"]; uiSleep 0.1; ((diag_tickTime - _testTime) >= 10);};
if (!isNull _display) then {
TimeOutDisplayed = true;
};
}; };
_btnAbort ctrlEnable true; _btnAbort ctrlEnable true;
_btnAbort ctrlSetText _btnAbortText; _btnAbort ctrlSetText _btnAbortText;
}; };
}; };
if (!isNull _display) then { //this prevents the timeout from being skipped if the menu is quickly re-opened if (isNull _display) then { //this prevents the timeout from being skipped if the menu is quickly re-opened
TimeOutDisplayed = false; TimeOutDisplayed = false;
}; };
uiSleep 1; uiSleep 0.1;
}; };
TimeOutDisplayed = false; TimeOutDisplayed = false;