W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix force save when pressing F4

Browse Source 
Forgot to remove F4 from the blocked list in 5acad04 @icomrade so it was
being overwritten.

Shift + P is not a hardcoded engine bind. It is just the default
DSInterface bind, so actionKeys "DSInterface" covers that in f760896.
This commit is contained in:
ebayShopper
2017-10-28 18:34:37 -04:00
parent 82ccecef6c
commit 780d5d8775
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -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";
};

1
SQF/dayz_code/init/variables.sqf
View File

@@ -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;

2
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1055,8 +1055,6 @@ class FSM
name = "Preload_Display";
itemno = 29;
init = /*%FSM<STATEINIT""">*/"if (_debug == 1) then {diag_log [diag_tickTime,'Preload_Display'];};" \n
"" \n
"dayz_lastCheckBit = 0;" \n
"" \n
"player disableConversation true;" \n
"" \n