W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix VON block mistake from b9a5c59

Browse Source 
I forgot filterCheats is already called in keyboard.sqf
This commit is contained in:
ebaydayz
2016-11-25 19:31:14 -05:00
parent 27f492f401
commit d14416931a
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -99,6 +99,7 @@ class RscDisplayChat
class RscDisplayChannel class RscDisplayChannel
{ {
idd = 63; 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"; onMouseButtonDown = "_handle = if (!isNil 'DZE_FilterCheats') then {[0,(_this select 1),false] call DZE_FilterCheats} else {false}; _handle";
class controls; class controls;
}; };

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

@@ -148,13 +148,6 @@ if (isNil "keyboard_keys") then {
dayz_lastCheckBit = diag_ticktime; dayz_lastCheckBit = diag_ticktime;
[player,20,true,(getPosATL player)] call player_alertZombies; [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 = { _journal = {
if (!dayz_isSwimming and !dialog) then { if (!dayz_isSwimming and !dialog) then {
@@ -287,14 +280,9 @@ if (isNil "keyboard_keys") then {
[actionKeys "MoveBack", _interrupt] call _addArray; [actionKeys "MoveBack", _interrupt] call _addArray;
[actionKeys "TurnLeft", _interrupt] call _addArray; [actionKeys "TurnLeft", _interrupt] call _addArray;
[actionKeys "TurnRight", _interrupt] call _addArray; [actionKeys "TurnRight", _interrupt] call _addArray;
[actionKeys "PushToTalk", _checkVoice] call _addArray; [actionKeys "PushToTalk", _noise] call _addArray;
[actionKeys "PushToTalkAll", _checkVoice] call _addArray; [actionKeys "VoiceOverNet", _noise] call _addArray;
[actionKeys "PushToTalkCommand", _checkVoice] call _addArray; [actionKeys "PushToTalkDirect", _noise] 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 "Chat", _noise] call _addArray; [actionKeys "Chat", _noise] call _addArray;
[actionKeys "User20", _journal] call _addArray; [actionKeys "User20", _journal] call _addArray;
[actionKeys "Diary", _journal] call _addArray; [actionKeys "Diary", _journal] call _addArray;

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

@@ -685,7 +685,7 @@ if (!isDedicated) then {
dayz_getout = objNull; dayz_getout = objNull;
dayz_getoutTime = 0; dayz_getoutTime = 0;
dayz_HitBy = objNull; dayz_HitBy = objNull;
dayz_voiceControls = [-999]; dayz_voiceControls = [];
{dayz_voiceControls = dayz_voiceControls + (actionKeys _x)} count ["VoiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"]; {dayz_voiceControls = dayz_voiceControls + (actionKeys _x)} count ["VoiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"];
// EPOCH ADDITIONS // EPOCH ADDITIONS