shithub: choc

Download patch

ref: 84f136b51e07b4d9815c6b033e897ebaef4f16a7
parent: 7a7a66e0af1be72938616b04ebebe6bd9dbd706c
author: Simon Howard <[email protected]>
date: Sun Mar 23 17:06:02 EDT 2014

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.

--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -1663,7 +1663,7 @@
     }
 
     if ((devparm && key == key_menu_help) ||
-        key == key_menu_screenshot)
+        (key != 0 && key == key_menu_screenshot))
     {
 	G_ScreenShot ();
 	return true;
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -1113,7 +1113,7 @@
     }
 
     if ((ravpic && key == KEY_F1) ||
-        key == key_menu_screenshot)
+        (key != 0 && key == key_menu_screenshot))
     {
         G_ScreenShot();
         return (true);
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -1213,7 +1213,7 @@
     }
 
     if ((ravpic && key == KEY_F1) ||
-        key == key_menu_screenshot)
+        (key != 0 && key == key_menu_screenshot))
     {
         G_ScreenShot();
         return (true);
--- a/src/m_controls.c
+++ b/src/m_controls.c
@@ -179,7 +179,7 @@
 
 int key_menu_incscreen = KEY_EQUALS;
 int key_menu_decscreen = KEY_MINUS;
-int key_menu_screenshot = -1;
+int key_menu_screenshot = 0;
 
 //
 // Joystick controls
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -2086,7 +2086,7 @@
             G_ScreenShot();
             return true;
         }
-        else if (key == key_menu_screenshot)
+        else if (key != 0 && key == key_menu_screenshot)
         {
             G_ScreenShot();
             return true;