zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- DSkippableScreenJob::OnEvent(): Ensure previously ignored keys don't cause a screenjob to skip.

Browse source 
* Volume up/down on the keyboard when trying to listen to a cut-scene shouldn't skip it.
This commit is contained in:
Mitchell Richters 2021-04-20 20:07:20 +10:00
parent a919e526ec
commit 321bfe86f8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/screenjob.cpp
View file

@ -60,10 +60,15 @@ IMPLEMENT_CLASS(DImageScreen, true, false)
bool DSkippableScreenJob::OnEvent(event_t* evt)
{
if (evt->type == EV_KeyDown)
{
auto& key = evt->data1;
bool ignoredkeys = key == KEY_VOLUMEDOWN || key == KEY_VOLUMEUP || (key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT);
if (!ignoredkeys)
{
state = skipped;
Skipped();
}
}
return true;
}