From c8b3053496dfef40678adef690056b55c3fd90d6 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Mon, 5 Sep 2016 14:16:38 -0400 Subject: [PATCH] Remove unused keyboard_keys function I moved the compile up in compiles.sqf since vanilla is now updated with the change: https://github.com/DayZMod/DayZ/commit/f5780256eee23d7b6ada7acac0105737a18516c4 --- SQF/dayz_code/Configs/rscTitles.hpp | 2 +- SQF/dayz_code/compile/keyboard.sqf | 15 --------------- SQF/dayz_code/init/compiles.sqf | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index def7d0b7c..53ffe1883 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -36,7 +36,7 @@ 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 + onKeyDown = "if (!isNil 'DZ_KeyDown_EH') then {_this call DZ_KeyDown_EH;};"; //assigned much quicker than spawning init_keyboard }; class RscDisplayChat { diff --git a/SQF/dayz_code/compile/keyboard.sqf b/SQF/dayz_code/compile/keyboard.sqf index df76040fd..617123ce7 100644 --- a/SQF/dayz_code/compile/keyboard.sqf +++ b/SQF/dayz_code/compile/keyboard.sqf @@ -9,18 +9,6 @@ _altState = _this select 4; _handled = false; if (isNil "keyboard_keys") then { - _deadcheck = { // ESCAPE -// call player_forceSave; -// _idd = uiNamespace getVariable "RscDisplayMPInterrupt"; -// if (isNil '_idd') then { -// createDialog 'RscDisplayMPInterrupt'; -// } -// else { -// closeDialog 0; -// }; - //keyboard_keys = nil;*/ - _handled = false; - }; _cancelBuild = { DZE_cancelBuilding = true; call dayz_EjectPlayer; @@ -310,7 +298,6 @@ if (isNil "keyboard_keys") then { [actionKeys "User18", {DZE_6 = true;}] call _addArray; [actionKeys "User19", {DZE_5 = true;}] call _addArray; [actionKeys "Surrender", _surrender] call _addArray; - //[[DIK_ESCAPE], _deadcheck] call _addArray; [[DIK_1], _rifle] call _addArray; [[DIK_2], _pistol] call _addArray; [[DIK_3], _melee] call _addArray; @@ -346,9 +333,7 @@ if (isNil "keyboard_keys") then { DIK_F8,DIK_F7,DIK_F6,DIK_F5,DIK_F4, DIK_F3,DIK_F2,DIK_9, DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray; - 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" ]; }; _this call DZE_FilterCheats; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 4e387ef27..d1248a28a 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -620,6 +620,7 @@ fn_getModelName = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile fn_niceSpot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_niceSpot.sqf"; fnc_Obj_handleDam = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\obj_handleDam.sqf"; object_roadFlare = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_roadFlare.sqf"; +DZ_KeyDown_EH = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\keyboard.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\traps\init.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\psrnd.sqf"; // pseudo random for plantSpanwer @@ -633,7 +634,6 @@ 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 "\z\addons\dayz_code\compile\keyboard.sqf"; DZE_FilterCheats = { #define DIK_SUBTRACT 0x4A