summaryrefslogtreecommitdiff
path: root/src/doom
diff options
context:
space:
mode:
authorSimon Howard2014-03-23 21:06:02 -0400
committerSimon Howard2014-03-23 21:06:02 -0400
commit84f136b51e07b4d9815c6b033e897ebaef4f16a7 (patch)
treece378d9b1baede8e1c0b6476097f2ede09a378ca /src/doom
parent7a7a66e0af1be72938616b04ebebe6bd9dbd706c (diff)
downloadchocolate-doom-84f136b51e07b4d9815c6b033e897ebaef4f16a7.tar.gz
chocolate-doom-84f136b51e07b4d9815c6b033e897ebaef4f16a7.tar.bz2
chocolate-doom-84f136b51e07b4d9815c6b033e897ebaef4f16a7.zip
Set default for key_menu_screenshot to 0.
In #364 I recommended -1 as the default to avoid taking screenshots in some situations where a key event is posted for key 0. It turns out that wasn't such a great idea, as -1 is not parsed properly by the config parser, and is shown as ??-1 in the setup tool. Default to zero instead, and add guards to prevent screenshots being taken by mistake. Thanks to Alexandre-Xavier for pointing this out.
Diffstat (limited to 'src/doom')
-rw-r--r--src/doom/m_menu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
index 36f7f809..c1329953 100644
--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -1663,7 +1663,7 @@ boolean M_Responder (event_t* ev)
}
if ((devparm && key == key_menu_help) ||
- key == key_menu_screenshot)
+ (key != 0 && key == key_menu_screenshot))
{
G_ScreenShot ();
return true;