diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index d928e9111..b0f2b510a 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -99,6 +99,7 @@ class RscDisplayChat class RscDisplayChannel { idd = 63; + onKeyDown = "_handle = if (!isNil 'DZE_FilterCheats') then {_this call DZE_FilterCheats} else {false}; _handle"; onMouseButtonDown = "_handle = if (!isNil 'DZE_FilterCheats') then {[0,(_this select 1),false] call DZE_FilterCheats} else {false}; _handle"; class controls; }; diff --git a/SQF/dayz_code/compile/keyboard.sqf b/SQF/dayz_code/compile/keyboard.sqf index 8df5c3007..0e57f5a90 100644 --- a/SQF/dayz_code/compile/keyboard.sqf +++ b/SQF/dayz_code/compile/keyboard.sqf @@ -148,13 +148,6 @@ if (isNil "keyboard_keys") then { dayz_lastCheckBit = diag_ticktime; [player,20,true,(getPosATL player)] call player_alertZombies; }; - }; - _checkVoice = { - if (diag_ticktime - dayz_lastCheckBit > 10) then { - dayz_lastCheckBit = diag_ticktime; - [player,20,true,(getPosATL player)] call player_alertZombies; - }; - _handled = if (!isNil "DZE_FilterCheats") then {[0,-999,false] call DZE_FilterCheats} else {false}; }; _journal = { if (!dayz_isSwimming and !dialog) then { @@ -287,14 +280,9 @@ if (isNil "keyboard_keys") then { [actionKeys "MoveBack", _interrupt] call _addArray; [actionKeys "TurnLeft", _interrupt] call _addArray; [actionKeys "TurnRight", _interrupt] call _addArray; - [actionKeys "PushToTalk", _checkVoice] call _addArray; - [actionKeys "PushToTalkAll", _checkVoice] call _addArray; - [actionKeys "PushToTalkCommand", _checkVoice] call _addArray; - [actionKeys "PushToTalkDirect", _checkVoice] call _addArray; - [actionKeys "PushToTalkGroup", _checkVoice] call _addArray; - [actionKeys "PushToTalkSide", _checkVoice] call _addArray; - [actionKeys "PushToTalkVehicle", _checkVoice] call _addArray; - [actionKeys "VoiceOverNet", _checkVoice] call _addArray; + [actionKeys "PushToTalk", _noise] call _addArray; + [actionKeys "VoiceOverNet", _noise] call _addArray; + [actionKeys "PushToTalkDirect", _noise] call _addArray; [actionKeys "Chat", _noise] call _addArray; [actionKeys "User20", _journal] call _addArray; [actionKeys "Diary", _journal] call _addArray; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e5697c81e..529297789 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -685,7 +685,7 @@ if (!isDedicated) then { dayz_getout = objNull; dayz_getoutTime = 0; dayz_HitBy = objNull; - dayz_voiceControls = [-999]; + dayz_voiceControls = []; {dayz_voiceControls = dayz_voiceControls + (actionKeys _x)} count ["VoiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"]; // EPOCH ADDITIONS