From 7f27444e2e93702fbd23dedc0fb7e7b4f3e13e50 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 17 Aug 2013 21:34:17 +0000
Subject: Fix Chocolate Doom/Strife to emulate weird Vanilla behavior when the
 pause key is pressed in a menu with a scroll-bar (thanks Alexandre Xavier).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2620
---
 src/doom/m_menu.c   | 9 ++++++---
 src/strife/m_menu.c | 7 ++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
index d10a0622..450f1f12 100644
--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -1843,10 +1843,13 @@ boolean M_Responder (event_t* ev)
 	}
 	return true;
     }
-    else if (ch != 0)
-    {
-        // Keyboard shortcut?
 
+    // Keyboard shortcut?
+    // Vanilla Doom has a weird behavior where it jumps to the scroll bars
+    // when the pause key is pressed, so emulate this.
+
+    else if (ch != 0 || key == KEY_PAUSE)
+    {
 	for (i = itemOn+1;i < currentMenu->numitems;i++)
         {
 	    if (currentMenu->menuitems[i].alphaKey == ch)
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index a4d1b0a7..61d0bd58 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -2180,7 +2180,12 @@ boolean M_Responder (event_t* ev)
         }
         return true;
     }
-    else if (ch != 0)
+
+    // Keyboard shortcut?
+    // Vanilla Strife has a weird behavior where it jumps to the scroll bars
+    // when the pause key is pressed, so emulate this.
+
+    else if (ch != 0 || key == KEY_PAUSE)
     {
         // Keyboard shortcut?
 
-- 
cgit v1.2.3