From ec169fd1c28b2ba3b6b6fc7e7123e9d27516dd5f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 13 Jan 2011 20:34:55 +0000
Subject: In configuration files, use the scan code for right shift, not left
 shift, to match Vanilla (thanks AlexXav).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2238
---
 setup/configfile.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'setup/configfile.c')

diff --git a/setup/configfile.c b/setup/configfile.c
index c4e8a408..c7109739 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -417,8 +417,18 @@ static void SaveDefaultCollection(default_collection_t *collection)
                 
                 v = * (int *) defaults[i].location;
 
-                if (defaults[i].untranslated
-                 && v == defaults[i].original_translated)
+                if (v == KEY_RSHIFT)
+                {
+                    // Special case: for shift, force scan code for
+                    // right shift, as this is what Vanilla uses.
+                    // This overrides the change check below, to fix
+                    // configuration files made by old versions that
+                    // mistakenly used the scan code for left shift.
+
+                    v = 54;
+                }
+                else if (defaults[i].untranslated
+                      && v == defaults[i].original_translated)
                 {
                     // Has not been changed since the last time we
                     // read the config file.
-- 
cgit v1.2.3