diff --git a/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp b/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp index 9d77d01bf..c3f187357 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp @@ -1,5 +1,6 @@ class RscDisplayMainMap { + onKeyDown = "if (!isNil 'DZE_FilterCheats') then {_this call DZE_FilterCheats;}; false"; class controls { delete CA_MainBackground; diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 92c1887a1..def7d0b7c 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -20,6 +20,7 @@ class IGUIBack; class RscListBox; class RscIGUIListBox; class RscHTML; +class RscDisplayEmpty; #include "CfgPlayerStats\defines.hpp" #include "CfgPlayerStats\p__cover.hpp" @@ -31,6 +32,19 @@ class RscHTML; #include "CfgPlayerStats\p_murders.hpp" #include "CfgPlayerStats\sound.hpp" +class RscDisplayMission: RscDisplayEmpty +{ + access = 0; + idd = 46; + onKeyDown = "if (!isNil 'DZ_KeyDown_EH') then {_this call DZ_KeyDown_EH;};"; //assigned much quicker than executing keyDown.sqf +}; +class RscDisplayChat +{ + idd = 24; + onKeyDown = "if (!isNil 'DZE_FilterCheats') then {_this call DZE_FilterCheats;}; false"; + class controls; +}; + class RscPictureGUI { access = 0; @@ -280,6 +294,7 @@ class RscDisplayMain : RscStandardDisplay class RscDisplayDiary { idd = 129; movingEnable = 0; + onKeyDown = "if (!isNil 'DZE_FilterCheats') then {_this call DZE_FilterCheats;}; false"; class Controls { delete Diary; diff --git a/SQF/dayz_code/compile/keyboard.sqf b/SQF/dayz_code/compile/keyboard.sqf index 049af3856..f81390fe4 100644 --- a/SQF/dayz_code/compile/keyboard.sqf +++ b/SQF/dayz_code/compile/keyboard.sqf @@ -347,25 +347,15 @@ if (isNil "keyboard_keys") then { DIK_F3,DIK_F2,DIK_9, DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray; - (findDisplay 46) displayRemoveAllEventHandlers "KeyUp"; - (findDisplay 46) displayRemoveAllEventHandlers "KeyDown"; - (findDisplay 46) displayAddEventHandler ["KeyDown", preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf')]; + //(findDisplay 46) displayRemoveAllEventHandlers "KeyUp"; + //(findDisplay 46) displayRemoveAllEventHandlers "KeyDown"; + //(findDisplay 46) displayAddEventHandler ["KeyDown", preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf')]; if (!isNil "bis_fnc_halo_keydown_eh") then {bis_fnc_halo_keydown_eh = (finddisplay 46) displayaddeventhandler ["keydown","_this call bis_fnc_halo_keydown;"];}; // halo in progress //diag_log [diag_ticktime, __FILE__, "eh reset" ]; }; -if (_dikCode == DIK_NUMPADMINUS && _shiftState) then { - call player_forceSave; - disableUserInput true;disableUserInput true; - [] spawn { //disable input, this is unfortunately the only way to stop cheat input - titleText ["DO NOT ENTER CHEATS, WAIT 5 SECONDS TO CONTINUE!", "PLAIN", 1]; - uiSleep 5; - if (!r_player_unconsciousInputDisabled) then { - //weird disableuserInput behavior, enable input, disable and reenable to prevent the last key press being input after re-enable - disableUserInput false;disableUserInput true;disableUserInput false;disableUserInput false; - }; - }; -}; +_this call DZE_FilterCheats; + if (r_player_unconsciousInputDisabled) exitWith {true}; _code = keyboard_keys select _dikCode; if (!isNil "_code") then { diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 36bc9c6e2..ad30b86b6 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -633,6 +633,28 @@ local_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\comp FNC_GetSetPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getSetPos.sqf"; FNC_GetPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getPos.sqf"; dayz_EjectPlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dze_ejectPlayer.sqf"; +DZ_KeyDown_EH = compile preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf'); + +DZE_FilterCheats = { + #define DIK_SUBTRACT 0x4A + #define DIK_NUMPADMINUS DIK_SUBTRACT + _dik = _this select 1; + _shift = _this select 2; + if (_dik == DIK_NUMPADMINUS && _shift) then { + call player_forceSave; + disableUserInput true;disableUserInput true; + [] spawn { //disable input, this is unfortunately the only way to stop cheat input + _testTime = diag_tickTime; + CheatsDisabled = _testTime; + titleText ["DO NOT ENTER CHEATS, WAIT 5 SECONDS TO CONTINUE!", "PLAIN", 1]; + uiSleep 5; + if (!r_player_unconsciousInputDisabled && CheatsDisabled == _testTime) then { + //weird disableuserInput behavior, enable input, disable and reenable to prevent the last key press being input after re-enable + disableUserInput false;disableUserInput true;disableUserInput false;disableUserInput false; + }; + }; + }; +}; player_sumMedical = { private["_character","_wounds","_legs","_arms","_medical","_status"]; @@ -668,11 +690,11 @@ player_sumMedical = { _medical }; -init_keyboard = { +/* init_keyboard = { //in Epoch we handle keypresses via config onKeyDown entries. waituntil {!(isNull (findDisplay 46))}; keyboard_keys = nil; [controlNull, 1, false,false,false] call compile preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf'); -}; +}; */ dayz_reduceItems = { private ["_item","_class","_amount","_qtyRemaining"]; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 511ebad5b..9774b93ad 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index 1a74fdf2a..e3651d209 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index b94c1a353..19f76f027 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { @@ -141,6 +141,10 @@ if (!isDedicated) then { if (dayz_enableRules) then { execVM "rules.sqf"; }; if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; }; execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; + "PVDZ_pass" addPublicVariableEventHandler {call ((_this select 1) select 1)}; + "PVDZ_fail" addPublicVariableEventHandler {call (_this select 1)}; + PVDZ_getTickTime = [player]; + publicVariableServer "PVDZ_getTickTime"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; //[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";}; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index d2568f37c..66bf6dfe2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 8ee435fbc..437f5ee77 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 065e8fba7..16f389c35 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 2a1bbde4e..b777b4f78 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index e72ab26fe..25c39b764 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file 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 8caae7c41..cf08555e4 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 @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index c327bb7ec..b43d03a19 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index a805dfdcc..822d292c6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index d04946f15..4f390cd29 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file 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 cb2c135a6..5466dcc98 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 @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file 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 62386e813..f2ba08505 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index c41c6bef2..e614eada8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 05a0a18c9..79b6871d6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file 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 b3be2dd8f..f8be3d531 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index 9489bf7ed..40cc49355 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index e5de3d7f8..a8a3050a7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index 4b73414b9..6079221a1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 9da4a6cae..3716c83ca 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 49d91726f..3f9a2bcf8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index 5f62150a3..d7a17216a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -79,7 +79,7 @@ MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ diag_log 'dayz_preloadFinished reset'; dayz_preloadFinished=nil; onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;"; -onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; if (!isNil 'init_keyboard') then {[] spawn init_keyboard;}; dayz_preloadFinished = true;"; +onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFinished = true;"; with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon if (!isDedicated) then { diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/keyboard.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/keyboard.sqf deleted file mode 100644 index be4f1ac39..000000000 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/keyboard.sqf +++ /dev/null @@ -1 +0,0 @@ -#include "\z\addons\dayz_code\compile\keyboard.sqf" \ No newline at end of file