diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 086a932f4..c12790489 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -781,6 +781,68 @@ class bloodTest }; #include "RscDisplay\includes.hpp" + +//Override BIS Loadscreen +class RscDisplayLoadCustom +{ + idd = -1; + onLoad = "uiNamespace setVariable ['BIS_loadingScreen',_this select 0];"; + + class ControlsBackground + { + class BackgroundText: RscText + { + idc = 1000; + x = -0.015625 * safezoneW + safezoneX; + y = -0.00875001 * safezoneH + safezoneY; + w = 1.10215 * safezoneW; + h = 1.11375 * safezoneH; + colorBackground[] = {0,0,0,1}; + }; + + class BackgroundPicture: RscPictureKeepAspect + { + idc = 1200; + text = "#(argb,8,8,3)color(1,1,1,0)"; + x = -0.711867; + y = -0.34; + w = 2.42373; + h = 1.54596; + }; + + }; + + class controls + { + + class LoadingText: RscStructuredText + { + idc = 8400; + x = 0.242133 * safezoneW + safezoneX; + y = 0.9 * safezoneH + safezoneY; + w = 0.515733 * safezoneW; + h = 0.0274911 * safezoneH; + }; + class TimeoutText: RscStructuredText + { + idc = 102; + x = 0.92548 * safezoneW + safezoneX; + y = 0.9 * safezoneH + safezoneY; + w = 0.04 * safezoneW; + h = 0.0274911 * safezoneH; + }; + class ProgressBar : RscProgress + { + idc = 1010; + x = 0.242133 * safezoneW + safezoneX; + y = 0.95 * safezoneH + safezoneY; + w = 0.515733 * safezoneW; + h = 0.02 * safezoneH; + + }; + }; +}; + class RscDisplayDSinterface: RscStandardDisplay { idd = 155; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index da1d24379..6c1de18eb 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -363,7 +363,7 @@ class FSM "dayz_loadScreenMsg = localize 'str_player_waiting_creation'; " \n "" \n "_playerUID = getPlayerUID player;" \n - "progressLoadingScreen 0.6;" \n + "dayz_progressBarValue = 0.6;" \n "if (_debug == 1) then {diag_log [diag_tickTime,'Collect'];};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -429,7 +429,7 @@ class FSM "dayz_loadScreenMsg = localize 'str_player_request';" \n "" \n "_msg = [];" \n - "progressLoadingScreen 0.65;" \n + "dayz_progressBarValue = 0.65;" \n "PVDZ_plr_Login1 = [_playerUID,player];" \n "publicVariableServer ""PVDZ_plr_Login1"";" \n "diag_log ['Sent to server: PVDZ_plr_Login1', PVDZ_plr_Login1]; " \n @@ -472,7 +472,7 @@ class FSM name = "Parse_Login"; itemno = 13; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Parse_Login'];};" \n - "progressLoadingScreen 0.8;" \n + "dayz_progressBarValue = 0.8;" \n "_charID = _msg select 0;" \n "_inventory = _msg select 1;" \n "_backpack = _msg select 2;" \n @@ -944,7 +944,7 @@ class FSM name = "Position"; itemno = 23; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Position'];};" \n - "progressLoadingScreen 0.85;" \n + "dayz_progressBarValue = 0.85;" \n ""/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links @@ -980,7 +980,7 @@ class FSM name = "Load_In"; itemno = 25; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Load_In'];};" \n - "progressLoadingScreen 0.95;" \n + "dayz_progressBarValue = 0.95;" \n "dayz_loadScreenMsg = localize 'str_player_setup_completed';" \n "_torev4l=nearestObjects [_setPos, Dayz_plants + DayZ_GearedObjects + [""AllVehicles"",""WeaponHolder""], 50];" \n "{ _null = [_x,0] spawn object_roadFlare; } count (allMissionObjects ""RoadFlare"");" \n @@ -1956,7 +1956,7 @@ class FSM "PVDZ_plr_LoginRecord = [_playerUID,_charID,0,toArray dayz_playerName];" \n "" \n "" \n - "progressLoadingScreen 1;" \n + "dayz_progressBarValue = 1;" \n "" \n "diag_log format ['Sent to server PVDZ_plr_LoginRecord: [%1, %2, %3, %4]',_playerUID,_charID,0,dayz_playerName]; " \n "" \n diff --git a/SQF/dayz_code/system/progress_monitor.sqf b/SQF/dayz_code/system/progress_monitor.sqf index c5ac58d1e..14f82a4cf 100644 --- a/SQF/dayz_code/system/progress_monitor.sqf +++ b/SQF/dayz_code/system/progress_monitor.sqf @@ -9,7 +9,7 @@ while {true} do { uiSleep 5; endMission "END1"; }; - if ((!isNil "Dayz_loginCompleted") and {(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 @@ -20,7 +20,7 @@ while {true} do { if (profileNamespace getVariable ["streamerMode",0] == 1) then {_watermark ctrlShow false;}; }; - if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { + if (dayz_enableRules && {profileNamespace getVariable ["streamerMode",0] == 0}) then { dayz_rulesHandle = execVM "rules.sqf"; }; @@ -28,12 +28,17 @@ while {true} do { }; _display = uiNameSpace getVariable "BIS_loadingScreen"; if (!isNil "_display") then { + _image = _display displayCtrl 1200; + _image ctrlSetText getText(missionConfigFile >> "loadScreen"); if (dayz_loadScreenMsg != "" ) then { _control1 = _display displayctrl 8400; - _control1 ctrlSetText dayz_loadScreenMsg; + _control1 ctrlSetStructuredText parseText format["%1",dayz_loadScreenMsg]; }; _control2 = _display displayctrl 102; - _control2 ctrlSetText format["%1",floor(diag_ticktime - _timeoutStart)]; + _control2 ctrlSetStructuredText parseText format["%1",floor(diag_ticktime - _timeoutStart)]; + + _bar = _display displayCtrl 1010; + _bar progressSetPosition dayz_progressBarValue; }; uiSleep 0.2; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 9e6bdbc25..d4530d797 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\takistan.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 1f7864b98..01f003e69 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index ae54e6a98..3f2a37051 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\isladuala.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 5c4fecf09..d4b5d9c96 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\tavi.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 1d7bb38f1..9e6265a2e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -86,7 +86,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -96,13 +96,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\namalsk.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index daf87aa4f..9ffa0ba91 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\panthera2.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 3dd4144e1..cf620ff54 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus17.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index a00a3c84a..1ffa3643e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fdf_isle1_a.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/init.sqf index 836ed7f06..0395ec888 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/init.sqf @@ -86,7 +86,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -96,13 +96,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index d5578f89f..36aed21f9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\caribou.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index cc088e308..d49db3585 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -84,7 +84,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -94,13 +94,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\smd_sahrani_a2.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index c2d6edd4a..717ecc8a4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\cmr_ovaron.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 03bb2a35b..db321856c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\napf.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index b7bfdfc69..0ae7da1af 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index 4548a58ef..76072c64a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf index d595b13c8..4ffae624c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\ruegen.sqf"; //Add trader city objects locally on every machine early initialized = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 96609b5f2..e00aa0af4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -85,7 +85,7 @@ with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { enableSaving [false, false]; startLoadingScreen ["","RscDisplayLoadCustom"]; - progressLoadingScreen 0; + dayz_progressBarValue = 0; dayz_loadScreenMsg = localize 'str_login_missionFile'; progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf"; 0 cutText ['','BLACK',0]; @@ -95,13 +95,13 @@ if (!isDedicated) then { initialized = false; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf"; -progressLoadingScreen 0.05; +dayz_progressBarValue = 0.05; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf"; -progressLoadingScreen 0.1; +dayz_progressBarValue = 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; -progressLoadingScreen 0.15; +dayz_progressBarValue = 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.25; +dayz_progressBarValue = 0.25; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\lingor.sqf"; //Add trader city objects locally on every machine early initialized = true;