teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Make screenjob valid keys for skipping ignore the Alt key as its used for modifiers, and special keys like the screenshot bind.

Browse source 
* Partially revert 8bb13bc4c2 as its changes are no longer needed.
* Partially revert 9e40e49c2c as its changes are no longer needed.
* Fixes #577.
This commit is contained in:
Mitch Richters 2021-11-18 20:59:07 +11:00
parent 719724da53
commit 4d629e7de8
3 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/core/inputstate.cpp
View file

@ -80,32 +80,14 @@ void InputState::GetMouseDelta(ControlInfo * hidInput)
// //
//========================================================================== //==========================================================================
static int exclKeys[] = { KEY_VOLUMEDOWN, KEY_VOLUMEUP };
void InputState::AddEvent(const event_t *ev) void InputState::AddEvent(const event_t *ev)
{ {
if (ev->type == EV_KeyDown || ev->type == EV_KeyUp) if (ev->type == EV_KeyDown || ev->type == EV_KeyUp)
{ {
int key = ev->data1; int key = ev->data1;
bool state = ev->type == EV_KeyDown; bool state = ev->type == EV_KeyDown;
bool ignore = false;
KeyStatus[key] = (uint8_t)state; KeyStatus[key] = (uint8_t)state;
if (state && !(key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT))
// Check if key is to be excluded from setting AnyKeyStatus.
for (int i = 0; i < 2; i++)
{
if (exclKeys[i] == key)
{
ignore = true;
break;
}
}
if (key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT)
{
ignore = true;
}
if (state && !ignore)
AnyKeyStatus = true; AnyKeyStatus = true;
} }
} }

11
source/core/inputstate.h
View file

@ -127,14 +127,3 @@ inline void resetForcedSyncInput()
{ {
gamesetinput = false; gamesetinput = false;
} }
inline bool specialKeyEvent(event_t* ev)
{
if (ev->type == EV_KeyDown || ev->type == EV_KeyUp)
{
int key = ev->data1;
if (key == KEY_VOLUMEDOWN || key == KEY_VOLUMEUP || (key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT)) return true;
}
return false;
}

7
wadsrc/static/zscript/engine/base.zs
View file

@ -200,11 +200,14 @@ struct System native
if (ev.type == InputEvent.Type_KeyDown || ev.type == InputEvent.Type_KeyUp) if (ev.type == InputEvent.Type_KeyDown || ev.type == InputEvent.Type_KeyUp)
{ {
int key = ev.KeyScan; int key = ev.KeyScan;
if (key == InputEvent.KEY_VOLUMEDOWN || key == InputEvent.KEY_VOLUMEUP || (key > InputEvent.KEY_LASTJOYBUTTON && key < InputEvent.KEY_PAD_LTHUMB_RIGHT)) return true; let binding = Bindings.GetBinding(key);
bool volumekeys = key == InputEvent.KEY_VOLUMEDOWN || key == InputEvent.KEY_VOLUMEUP;
bool gamepadkeys = key > InputEvent.KEY_LASTJOYBUTTON && key < InputEvent.KEY_PAD_LTHUMB_RIGHT;
bool altkeys = key == InputEvent.KEY_LALT || key == InputEvent.KEY_RALT;
if (volumekeys || gamepadkeys || altkeys || binding ~== "screenshot") return true;
} }
return false; return false;
} }
} }
struct MusPlayingInfo native struct MusPlayingInfo native