From 843a238cd7e7eff5c3fb521d2aec04ba8ec1078c Mon Sep 17 00:00:00 2001 From: A Man Date: Mon, 27 Apr 2020 18:26:13 +0200 Subject: [PATCH] Update progress_monitor.sqf --- SQF/dayz_code/system/progress_monitor.sqf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/system/progress_monitor.sqf b/SQF/dayz_code/system/progress_monitor.sqf index 14f82a4cf..de053011b 100644 --- a/SQF/dayz_code/system/progress_monitor.sqf +++ b/SQF/dayz_code/system/progress_monitor.sqf @@ -1,17 +1,18 @@ -private["_display","_control1","_control2","_watermark"]; +private ["_display","_control1","_control2","_watermark","_timeoutStart","_image","_bar"]; disableSerialization; //diag_log "DEBUG: loadscreen guard started."; -_timeoutStart=diag_ticktime; +_timeoutStart = diag_ticktime; + while {true} do { if (diag_ticktime - _timeoutStart >= 120) exitWith { 1 cutText [localize "str_player_login_timeout", "PLAIN DOWN"]; uiSleep 5; endMission "END1"; }; - if ((!isNil "Dayz_loginCompleted") && {(Dayz_loginCompleted)}) exitWith { + if ((!isNil "Dayz_loginCompleted") && {(Dayz_loginCompleted)}) exitWith { //diag_log [ __FILE__, __LINE__, "End loop"]; - + // Logo watermark: adding a logo in the bottom left corner of the screen with the server name if (!isNil "dayZ_serverName") then { 5 cutRsc ["wm_disp","PLAIN"]; @@ -19,24 +20,24 @@ while {true} do { _watermark ctrlSetText dayZ_serverName; if (profileNamespace getVariable ["streamerMode",0] == 1) then {_watermark ctrlShow false;}; }; - + if (dayz_enableRules && {profileNamespace getVariable ["streamerMode",0] == 0}) then { dayz_rulesHandle = execVM "rules.sqf"; }; - + if (dayz_groupSystem) then {execVM "\z\addons\dayz_code\groups\init.sqf";}; }; _display = uiNameSpace getVariable "BIS_loadingScreen"; if (!isNil "_display") then { _image = _display displayCtrl 1200; - _image ctrlSetText getText(missionConfigFile >> "loadScreen"); + _image ctrlSetText getText(missionConfigFile >> "loadScreen"); if (dayz_loadScreenMsg != "" ) then { _control1 = _display displayctrl 8400; _control1 ctrlSetStructuredText parseText format["%1",dayz_loadScreenMsg]; }; _control2 = _display displayctrl 102; _control2 ctrlSetStructuredText parseText format["%1",floor(diag_ticktime - _timeoutStart)]; - + _bar = _display displayCtrl 1010; _bar progressSetPosition dayz_progressBarValue; }; @@ -44,4 +45,3 @@ while {true} do { uiSleep 0.2; //diag_log [ __FILE__, __LINE__, "Looping..."]; }; -