From f7f3db7174e9a375ff6a9e88c091d55a9e89c142 Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Fri, 25 Feb 2011 13:59:02 +0000
Subject: (svn r22142) -Fix (r22094): some valid keycodes were ignored along
 with the invalid ones

---
 src/hotkeys.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index 686877bf3..5ad8f2bf9 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -74,7 +74,8 @@ static uint16 ParseCode(const char *start, const char *end)
 	}
 	if (end - start == 1) {
 		if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A');
-		return *start;
+		/* Ignore invalid keycodes */
+		if (*(uint8*)start < 128) return *start;
 	}
 	return 0;
 }
@@ -99,10 +100,6 @@ static uint16 ParseKeycode(const char *start, const char *end)
 			if (code & ~WKC_SPECIAL_KEYS) return 0;
 			keycode |= code;
 		} else {
-			/* Ignore invalid keycodes */
-			if (code >= 128) {
-				return 0;
-			}
 			/* Ignore the code if it has more then 1 letter. */
 			if (keycode & ~WKC_SPECIAL_KEYS) return 0;
 			keycode |= code;
-- 
cgit v1.2.3-70-g09d2