Remove unnecessary rules and watermark waitUntils

This commit is contained in:
ebayShopper
2017-02-18 13:34:49 -05:00
parent 28fa8ef31e
commit d975def6a1
48 changed files with 14 additions and 104 deletions

View File

@@ -1,4 +1,4 @@
private["_display","_control1","_control2"];
private["_display","_control1","_control2","_watermark"];
disableSerialization;
//diag_log "DEBUG: loadscreen guard started.";
@@ -11,6 +11,19 @@ while {true} do {
};
if ((!isNil "Dayz_loginCompleted") and {(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"];
_watermark = (uiNamespace getVariable "wm_disp") displayCtrl 1;
_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";

View File

@@ -1,11 +0,0 @@
// Logo watermark: adding a logo in the bottom left corner of the screen with the server name in it
[] spawn {
waitUntil {(!isNull Player) and (alive Player) and (player == player)};
waituntil {!(isNull (findDisplay 46))};
5 cutRsc ["wm_disp","PLAIN"];
((uiNamespace getVariable "wm_disp") displayCtrl 1) ctrlSetText dayZ_serverName;
if (profileNamespace getVariable ["streamerMode",0] == 1) then {
(uiNamespace getVariable "wm_disp") displayCtrl 1 ctrlShow false;
};
};

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -131,8 +131,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],

View File

@@ -130,8 +130,6 @@ if (!isDedicated) then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

View File

@@ -1,7 +1,5 @@
private ["_messages","_timeout"];
waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
_messages = [
["DayZ Epoch", "Welcome "+(name player)],
["World", worldName],