summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-11-17 02:17:40 +0000
committerSimon Howard2013-11-17 02:17:40 +0000
commitf1926e7b81cd7e3e9d429590102dedb8d3e66f5a (patch)
treeadccb16b8f9e7a14f21750bd03eecec89787565b
parent33703db6c4ca9c23c3d5cbc4b8602bd9679f234a (diff)
downloadchocolate-doom-f1926e7b81cd7e3e9d429590102dedb8d3e66f5a.tar.gz
chocolate-doom-f1926e7b81cd7e3e9d429590102dedb8d3e66f5a.tar.bz2
chocolate-doom-f1926e7b81cd7e3e9d429590102dedb8d3e66f5a.zip
Remove KEY_RSHIFT special-casing from Heretic/Hexen menu code to fix
crashes when pressing shift while entering save game names (thanks chungy). Subversion-branch: /branches/v2-branch Subversion-revision: 2750
-rw-r--r--src/heretic/mn_menu.c5
-rw-r--r--src/hexen/mn_menu.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index 4958d9be..ab80d860 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -1079,10 +1079,11 @@ boolean MN_Responder(event_t * event)
return true;
}
- if (event->data1 != KEY_RSHIFT && event->type != ev_keydown)
+ if (event->type != ev_keydown)
{
- return (false);
+ return false;
}
+
key = event->data1;
charTyped = event->data2;
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index 3d068b0e..a6dbd19e 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -1174,7 +1174,9 @@ boolean MN_Responder(event_t * event)
return true;
}
- if (event->data1 != KEY_RSHIFT && event->type != ev_keydown)
+ // Only care about keypresses beyond this point.
+
+ if (event->type != ev_keydown)
{
return false;
}