Fix slow login timer and wrong login timeout message

This commit is contained in:
icomrade
2016-02-18 23:14:36 -05:00
parent 11dd17cb8f
commit 6db02d28bf
2 changed files with 1609 additions and 1541 deletions

View File

@@ -437,7 +437,7 @@ if (!isDedicated) then {
[] spawn { [] spawn {
private["_timeOut","_display","_control1","_control2"]; private["_timeOut","_display","_control1","_control2"];
disableSerialization; disableSerialization;
_timeOut = 0; _timeOut = diag_tickTime;
dayz_loadScreenMsg = ""; dayz_loadScreenMsg = "";
diag_log "DEBUG: loadscreen guard started."; diag_log "DEBUG: loadscreen guard started.";
_display = uiNameSpace getVariable "BIS_loadingScreen"; _display = uiNameSpace getVariable "BIS_loadingScreen";
@@ -450,7 +450,7 @@ if (!isDedicated) then {
}; };
// 120 sec timeout (12000 * 0.01) // 120 sec timeout (12000 * 0.01)
while { _timeOut < 12000 } do { while { (_timeOut + 120) > diag_tickTime } do {
if (dayz_clientPreload && dayz_authed) exitWith { if (dayz_clientPreload && dayz_authed) exitWith {
diag_log "PLOGIN: Login loop completed!"; diag_log "PLOGIN: Login loop completed!";
endLoadingScreen; endLoadingScreen;
@@ -469,19 +469,17 @@ if (!isDedicated) then {
dayz_loadScreenMsg = ""; dayz_loadScreenMsg = "";
}; };
_control2 ctrlSetText format["%1",round(_timeOut*0.01)]; _control2 ctrlSetText format["%1",round(diag_tickTime - _timeOut)];
}; };
_timeOut = _timeOut + 1; //_timeOut = _timeOut + 1;
uiSleep 0.001;
if (_timeOut >= 12000) then { };
1 cutText [localize "str_player_login_timeout", "PLAIN DOWN"]; if (diag_tickTime >= (_timeOut + 120)) then {
uiSleep 10; 1 cutText [localize "str_player_login_timeout", "PLAIN DOWN"];
endLoadingScreen; uiSleep 10;
endMission "END1"; endLoadingScreen;
}; endMission "END1";
uiSleep 0.01;
}; };
}; };

File diff suppressed because it is too large Load Diff