diff --git a/SQF/dayz_code/compile/keyboard.sqf b/SQF/dayz_code/compile/keyboard.sqf index 3cc22e79a..df2d0d962 100644 --- a/SQF/dayz_code/compile/keyboard.sqf +++ b/SQF/dayz_code/compile/keyboard.sqf @@ -300,7 +300,8 @@ if (isNil "keyboard_keys") then { [actionKeys "Diary", _journal] call _addArray; [actionKeys "NetworkStats", _journal] call _addArray; [[DIK_F1], _muteSound] call _addArray; - [[DIK_F4, DIK_TAB, DIK_DELETE], _forcesave] call _addArray; + [[DIK_F4], {if (diag_tickTime - dayz_lastSave > 10) then {call player_forceSave;};_handled = true;}] call _addArray; + [[DIK_TAB,DIK_DELETE], _forcesave] call _addArray; //[[DIK_F4, DIK_RMENU, DIK_LMENU,DIK_LSHIFT,DIK_RSHIFT,DIK_ESCAPE], _forcesave2] call _addArray; [actionKeys "LeanLeft", _build_left ] call _addArray; [actionKeys "LeanRight", _build_right ] call _addArray; @@ -310,7 +311,7 @@ if (isNil "keyboard_keys") then { // [[DIK_NUMPAD9], _rotate_right] call _addArray; [actionKeys "ForceCommandingMode", {DZE_5 = true;_handled = true;}] call _addArray; [[ DIK_F9,DIK_F10,DIK_F11,DIK_F12, - DIK_F8,DIK_F7,DIK_F6,DIK_F5,DIK_F4, + DIK_F8,DIK_F7,DIK_F6,DIK_F5, DIK_F3,DIK_F2,DIK_9, DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray; if (dayz_groupSystem) then { @@ -318,8 +319,7 @@ if (isNil "keyboard_keys") then { [[DIK_LWIN,DIK_RWIN], {dayz_groupNameTags = !dayz_groupNameTags;_handled = true;}] call _addArray; [actionKeys "TacticalView", _block] call _addArray; }; - [actionKeys "DSInterface", {_handled = true;}] call _addArray; - [[DIK_P], {if (_shiftState) then {_handled = true;};}] call _addArray; + [actionKeys "DSInterface", _block] call _addArray; diag_log "keyboard_keys reset"; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index ad376128b..fa3e4be1e 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -589,6 +589,7 @@ if (!isDedicated) then { //player special variables dayz_bloodBagHumanity = 300; + dayz_lastCheckBit = 0; dayz_lastDamageSourceNull = false; dayz_lastDamageSource = "none"; dayz_lastDamageTime = 0; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 757f18e22..b82366e6c 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1055,8 +1055,6 @@ class FSM name = "Preload_Display"; itemno = 29; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Preload_Display'];};" \n - "" \n - "dayz_lastCheckBit = 0;" \n "" \n "player disableConversation true;" \n "" \n