Added (all games): CVar "menu-hotkeys" 1= Enable hotkey navigation in…

… the menu. Enabled by default.
skyjake · Feb 9, 2009 · 3bbad8e · 3bbad8e
1 parent c378a13
commit 3bbad8e
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 7 deletions.
diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -1199,9 +1199,8 @@ static menu_t ColorWidgetMnu = {
 #endif
 };
 
-// Cvars for the menu
-cvar_t menuCVars[] =
-{
+// Cvars for the menu:
+cvar_t menuCVars[] = {
     {"menu-scale", 0, CVT_FLOAT, &cfg.menuScale, .1f, 1},
     {"menu-flash-r", 0, CVT_FLOAT, &cfg.flashColor[0], 0, 1},
     {"menu-flash-g", 0, CVT_FLOAT, &cfg.flashColor[1], 0, 1},
@@ -1221,13 +1220,14 @@ cvar_t menuCVars[] =
     {"menu-patch-replacement", 0, CVT_BYTE, &cfg.usePatchReplacement, 0, 2},
     {"menu-slam", 0, CVT_BYTE, &cfg.menuSlam, 0, 1},
     {"menu-quick-ask", 0, CVT_BYTE, &cfg.askQuickSaveLoad, 0, 1},
+    {"menu-hotkeys", 0, CVT_BYTE, &cfg.menuHotkeys, 0, 1},
 #if __JDOOM__ || __JDOOM64__
     {"menu-quitsound", 0, CVT_INT, &cfg.menuQuitSound, 0, 1},
 #endif
     {NULL}
 };
 
-// Console commands for the menu
+// Console commands for the menu:
 ccmd_t menuCCmds[] = {
     {"menu",        "", CCmdMenuAction},
     {"menuup",      "", CCmdMenuAction},
@@ -2241,9 +2241,9 @@ boolean Hu_MenuResponder(event_t* ev)
      * The first ASCII character of a menu item's text string is used
      * as a "hotkey" shortcut to allow navigating directly to that item.
      */
-    if(ev->type == EV_KEY &&
-       (ev->state == EVS_DOWN || ev->state == EVS_REPEAT) &&
-       !(menu->flags & MNF_NOHOTKEYS))
+    if(cfg.menuHotkeys && !(menu->flags & MNF_NOHOTKEYS) &&
+       ev->type == EV_KEY &&
+       (ev->state == EVS_DOWN || ev->state == EVS_REPEAT))
     {
         int                 i, first, last; // First and last, visible menu items.
         int                 cand = toupper(ev->data1);

diff --git a/doomsday/plugins/jdoom/data/conhelp.txt b/doomsday/plugins/jdoom/data/conhelp.txt
@@ -258,6 +258,9 @@ desc = Strength of type-in glitter.
 [menu-fog]
 desc = Menu fog mode: 0=off, 1=shimmer, 2=black smoke, 3=blue vertical, 4=grey smoke, 5=dimmed.
 
+[menu-hotkeys]
+desc = 1=Enable hotkey navigation in the menu.
+
 [menu-shadow]
 desc = Menu text shadow darkness.
 

diff --git a/doomsday/plugins/jdoom/include/d_config.h b/doomsday/plugins/jdoom/include/d_config.h
@@ -91,6 +91,7 @@ typedef struct jdoom_config_s {
     float           menuShadow;
     int             menuQuitSound;
     byte            menuSlam;
+    byte            menuHotkeys;
     byte            askQuickSaveLoad;
     float           flashColor[3];
     int             flashSpeed;

diff --git a/doomsday/plugins/jdoom/src/d_main.c b/doomsday/plugins/jdoom/src/d_main.c
@@ -425,6 +425,7 @@ void G_PreInit(void)
     cfg.menuColor[0] = 1;
     cfg.menuColor2[0] = 1;
     cfg.menuSlam = false;
+    cfg.menuHotkeys = true;
     cfg.askQuickSaveLoad = true;
 
     cfg.maxSkulls = true;

diff --git a/doomsday/plugins/jdoom64/data/conhelp.txt b/doomsday/plugins/jdoom64/data/conhelp.txt
@@ -254,6 +254,9 @@ desc = Strength of type-in glitter.
 [menu-fog]
 desc = Menu fog mode: 0=off, 1=shimmer, 2=black smoke, 3=blue vertical, 4=grey smoke, 5=dimmed.
 
+[menu-hotkeys]
+desc = 1=Enable hotkey navigation in the menu.
+
 [menu-shadow]
 desc = Menu text shadow darkness.
 

diff --git a/doomsday/plugins/jdoom64/include/d_config.h b/doomsday/plugins/jdoom64/include/d_config.h
@@ -92,6 +92,7 @@ typedef struct jdoom64_config_s {
     float           menuShadow;
     int             menuQuitSound;
     byte            menuSlam;
+    byte            menuHotkeys;
     byte            askQuickSaveLoad;
     float           flashColor[3];
     int             flashSpeed;

diff --git a/doomsday/plugins/jdoom64/src/d_main.c b/doomsday/plugins/jdoom64/src/d_main.c
@@ -308,6 +308,7 @@ void G_PreInit(void)
     cfg.menuColor[0] = 1;
     cfg.menuColor2[0] = 1;
     cfg.menuSlam = false;
+    cfg.menuHotkeys = true;
     cfg.askQuickSaveLoad = true;
 
     cfg.maxSkulls = true;

diff --git a/doomsday/plugins/jheretic/data/conhelp.txt b/doomsday/plugins/jheretic/data/conhelp.txt
@@ -270,6 +270,9 @@ desc = Strength of type-in glitter.
 [menu-fog]
 desc = Menu fog mode: 0=off, 1=shimmer, 2=black smoke, 3=blue vertical, 4=grey smoke, 5=dimmed.
 
+[menu-hotkeys]
+desc = 1=Enable hotkey navigation in the menu.
+
 [menu-shadow]
 desc = Menu text shadow darkness.
 

diff --git a/doomsday/plugins/jheretic/include/h_config.h b/doomsday/plugins/jheretic/include/h_config.h
@@ -90,6 +90,7 @@ typedef struct jheretic_config_s {
     float           menuShadow;
 
     byte            menuSlam;
+    byte            menuHotkeys;
     byte            askQuickSaveLoad;
     float           flashColor[3];
     int             flashSpeed;

diff --git a/doomsday/plugins/jheretic/src/h_main.c b/doomsday/plugins/jheretic/src/h_main.c
@@ -321,6 +321,7 @@ void G_PreInit(void)
     cfg.menuColor2[1] = defFontRGB2[1];
     cfg.menuColor2[2] = defFontRGB2[2];
     cfg.menuSlam = true;
+    cfg.menuHotkeys = true;
     cfg.askQuickSaveLoad = true;
 
     cfg.monstersStuckInDoors = false;

diff --git a/doomsday/plugins/jhexen/data/conhelp.txt b/doomsday/plugins/jhexen/data/conhelp.txt
@@ -282,6 +282,9 @@ desc = Strength of type-in glitter.
 [menu-fog]
 desc = Menu fog mode: 0=off, 1=shimmer, 2=black smoke, 3=blue vertical, 4=grey smoke, 5=dimmed.
 
+[menu-hotkeys]
+desc = 1=Enable hotkey navigation in the menu.
+
 [menu-shadow]
 desc = Menu text shadow darkness.
 

diff --git a/doomsday/plugins/jhexen/include/x_config.h b/doomsday/plugins/jhexen/include/x_config.h
@@ -162,6 +162,7 @@ typedef struct {
     float           menuColor[3];
     float           menuColor2[3];
     byte            menuSlam;
+    byte            menuHotkeys;
 
     byte            netMap, netClass, netColor, netSkill;
     byte            netEpisode; // Unused in Hexen.

diff --git a/doomsday/plugins/jhexen/src/h2_main.c b/doomsday/plugins/jhexen/src/h2_main.c
@@ -282,6 +282,7 @@ void G_PreInit(void)
     cfg.menuColor2[1] = defFontRGB2[1];
     cfg.menuColor2[2] = defFontRGB2[2];
     cfg.menuEffects = 0;
+    cfg.menuHotkeys = true;
     cfg.hudFog = 5;
     cfg.menuSlam = true;
     cfg.flashColor[0] = 1.0f;