From 990f7204094b2eb347da5dd8f1026f4060d802e1 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 18 Dec 2007 03:53:02 +0000 Subject: [PATCH] - Fixed: In the video modes menu, pressing Enter tried to change the screen mode, even if the cursor wasn't on one of the mode items. SVN r604 (trunk) --- docs/rh-log.txt | 2 ++ src/m_options.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 01808992e..4eb3653d7 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ December 17, 2007 +- Fixed: In the video modes menu, pressing Enter tried to change the screen + mode, even if the cursor wasn't on one of the mode items. - Fixed: Heretic's mace never respawned in deathmatch games. - Fixed: At resolutions taller than 600 pixels or so, tall sky textures were drawn a row too low. This was quite visible on Hexen MAP06. diff --git a/src/m_options.cpp b/src/m_options.cpp index 267e4d2c6..15ea0e829 100644 --- a/src/m_options.cpp +++ b/src/m_options.cpp @@ -2359,9 +2359,9 @@ void M_OptResponder (event_t *ev) } case '\r': - if (CurrentMenu == &ModesMenu) + if (CurrentMenu == &ModesMenu && item->type == screenres) { - if (!(item->type == screenres && GetSelectedSize (CurrentItem, &NewWidth, &NewHeight))) + if (!GetSelectedSize (CurrentItem, &NewWidth, &NewHeight)) { NewWidth = SCREENWIDTH; NewHeight = SCREENHEIGHT;