zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-30 16:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow blocking controller input in the menu.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-26 20:59:24 +01:00
parent 8cac2d8c84
commit 346ada76bc
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intermission/intermission.cpp
View file

@ -68,6 +68,7 @@ IMPLEMENT_POINTERS_END
extern int NoWipe; extern int NoWipe;
CVAR(Bool, nointerscrollabort, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
//========================================================================== //==========================================================================
// //
// //
@ -647,7 +648,7 @@ void DIntermissionScreenScroller::Init(FIntermissionAction *desc, bool first)
int DIntermissionScreenScroller::Responder (event_t *ev) int DIntermissionScreenScroller::Responder (event_t *ev)
{ {
int res = Super::Responder(ev); int res = Super::Responder(ev);
if (res == -1) if (res == -1 && !nointerscrollabort)
{ {
mBackground = mSecondPic; mBackground = mSecondPic;
mTicker = mScrollDelay + mScrollTime; mTicker = mScrollDelay + mScrollTime;

4
src/menu/menu.cpp
View file

@ -64,6 +64,7 @@ CVAR (Float, mouse_sensitivity, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Bool, show_messages, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, show_messages, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Bool, show_obituaries, true, CVAR_ARCHIVE) CVAR (Bool, show_obituaries, true, CVAR_ARCHIVE)
CVAR(Bool, m_showinputgrid, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Bool, m_showinputgrid, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, m_blockcontrollers, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR (Float, snd_menuvolume, 0.6f, CVAR_ARCHIVE) CVAR (Float, snd_menuvolume, 0.6f, CVAR_ARCHIVE)
@ -582,6 +583,9 @@ bool M_Responder (event_t *ev)
} }
else if (menuactive != MENU_WaitKey && (ev->type == EV_KeyDown || ev->type == EV_KeyUp)) else if (menuactive != MENU_WaitKey && (ev->type == EV_KeyDown || ev->type == EV_KeyUp))
{ {
// eat blocked controller events without dispatching them.
if (ev->data1 >= KEY_FIRSTJOYBUTTON && m_blockcontrollers) return true;
keyup = ev->type == EV_KeyUp; keyup = ev->type == EV_KeyUp;
ch = ev->data1; ch = ev->data1;

3
wadsrc/static/language.enu
View file

@ -1776,6 +1776,7 @@ MOUSEMNU_LOOKSTRAFE = "Lookstrafe";
JOYMNU_CONFIG = "CONFIGURE CONTROLLER"; JOYMNU_CONFIG = "CONFIGURE CONTROLLER";
JOYMNU_OPTIONS = "CONTROLLER OPTIONS"; JOYMNU_OPTIONS = "CONTROLLER OPTIONS";
JOYMNU_NOMENU = "Block controller input in menu";
// Player Setup Menu // Player Setup Menu
MNU_PLAYERSETUP = "PLAYER SETUP"; MNU_PLAYERSETUP = "PLAYER SETUP";
@ -1895,7 +1896,7 @@ MISCMNU_DEHLOAD = "Load *.deh/*.bex lumps";
MISCMNU_CACHENODES = "Cache nodes"; MISCMNU_CACHENODES = "Cache nodes";
MISCMNU_CACHETIME = "Time threshold for node caching"; MISCMNU_CACHETIME = "Time threshold for node caching";
MISCMNU_CLEARNODECACHE = "Clear node cache"; MISCMNU_CLEARNODECACHE = "Clear node cache";
MISCMNU_INTERSCROLL = "Allow skipping of intermission scrollers";
// Automap Options // Automap Options
AUTOMAPMNU_TITLE = "AUTOMAP OPTIONS"; AUTOMAPMNU_TITLE = "AUTOMAP OPTIONS";
AUTOMAPMNU_COLORSET = "Map color set"; AUTOMAPMNU_COLORSET = "Map color set";

2
wadsrc/static/menudef.txt
View file

@ -562,6 +562,7 @@ OptionMenu "JoystickOptionsDefaults"
{ {
Title "$JOYMNU_OPTIONS" Title "$JOYMNU_OPTIONS"
Option "$JOYMNU_ENABLE", "use_joystick", "YesNo" Option "$JOYMNU_ENABLE", "use_joystick", "YesNo"
Option "$JOYMNU_NOMENU", "m_blockcontrollers", "YesNo"
IfOption(Windows) IfOption(Windows)
{ {
Option "$JOYMNU_DINPUT", "joy_dinput", "YesNo" Option "$JOYMNU_DINPUT", "joy_dinput", "YesNo"
@ -945,6 +946,7 @@ OptionMenu "MiscOptions"
Option "$MISCMNU_SAVELOADCONFIRMATION", "saveloadconfirmation", "OnOff" Option "$MISCMNU_SAVELOADCONFIRMATION", "saveloadconfirmation", "OnOff"
Slider "$MISCMNU_AUTOSAVECOUNT", "autosavecount", 1, 20, 1, 0 Slider "$MISCMNU_AUTOSAVECOUNT", "autosavecount", 1, 20, 1, 0
Option "$MISCMNU_DEHLOAD", "dehload", "dehopt" Option "$MISCMNU_DEHLOAD", "dehload", "dehopt"
Option "$MISCMNU_INTERSCROLL", "nointerscrollabort", "OffOn"
StaticText " " StaticText " "
Option "$MISCMNU_CACHENODES", "gl_cachenodes", "OnOff" Option "$MISCMNU_CACHENODES", "gl_cachenodes", "OnOff"
Slider "$MISCMNU_CACHETIME", "gl_cachetime", 0.0, 2.0, 0.1 Slider "$MISCMNU_CACHETIME", "gl_cachetime", 0.0, 2.0, 0.1