X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fkeycode.cpp;h=990dee339df12113ec3e5d059e7869c7d1984ffb;hb=87291ea44a61614d5bd9efc0657926da3f867b5f;hp=cdf3c6062dde7aad2e5c7a0d77c8ce4c1b6bc2d6;hpb=5194505407884f6375311f0ab4c5f8783646cb91;p=oweals%2Fminetest.git

diff --git a/src/keycode.cpp b/src/keycode.cpp
index cdf3c6062..990dee339 100644
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -18,11 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "keycode.h"
-#include "main.h" // For g_settings
 #include "exceptions.h"
 #include "settings.h"
 #include "log.h"
-#include "hex.h"
+#include "debug.h"
+#include "util/hex.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -256,13 +256,18 @@ KeyPress::KeyPress() :
 
 KeyPress::KeyPress(const char *name)
 {
-	if (strlen(name) > 4) {
+	if (name[0] == 0) {
+		Key = irr::KEY_KEY_CODES_COUNT;
+		Char = L'\0';
+		return;
+	} else if (strlen(name) > 4) {
 		try {
 			Key = keyname_to_keycode(name);
 			m_name = name;
-			if (strlen(name) > 8) {
+			if (strlen(name) > 8 && strncmp(name, "KEY_KEY_", 8) == 0) {
 				int chars_read = mbtowc(&Char, name + 8, 1);
-				assert (chars_read == 1 && "unexpected multibyte character");
+
+				FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
 			} else
 				Char = L'\0';
 			return;
@@ -274,7 +279,8 @@ KeyPress::KeyPress(const char *name)
 		try {
 			Key = keyname_to_keycode(m_name.c_str());
 			int chars_read = mbtowc(&Char, name, 1);
-			assert (chars_read == 1 && "unexpected multibyte character");
+
+			FATAL_ERROR_IF(chars_read != 1, "Unexpected multibyte character");
 			return;
 		} catch (UnknownKeycode &e) {};
 	}
@@ -284,7 +290,7 @@ KeyPress::KeyPress(const char *name)
 	Key = irr::KEY_KEY_CODES_COUNT;
 
 	int mbtowc_ret = mbtowc(&Char, name, 1);
-	assert (mbtowc_ret == 1 && "unexpected multibyte character");
+	FATAL_ERROR_IF(mbtowc_ret != 1, "Unexpected multibyte character");
 	m_name = name[0];
 }
 
@@ -334,6 +340,7 @@ const char *KeyPress::name() const
 }
 
 const KeyPress EscapeKey("KEY_ESCAPE");
+const KeyPress CancelKey("KEY_CANCEL");
 const KeyPress NumberKey[] = {
 	KeyPress("KEY_KEY_0"), KeyPress("KEY_KEY_1"), KeyPress("KEY_KEY_2"),
 	KeyPress("KEY_KEY_3"), KeyPress("KEY_KEY_4"), KeyPress("KEY_KEY_5"),
@@ -345,17 +352,16 @@ const KeyPress NumberKey[] = {
 */
 
 // A simple cache for quicker lookup
-core::map<std::string, KeyPress> g_key_setting_cache;
+std::map<std::string, KeyPress> g_key_setting_cache;
 
 KeyPress getKeySetting(const char *settingname)
 {
-	core::map<std::string, KeyPress>::Node *n;
+	std::map<std::string, KeyPress>::iterator n;
 	n = g_key_setting_cache.find(settingname);
-	if(n)
-		return n->getValue();
-	g_key_setting_cache.insert(settingname,
-			g_settings->get(settingname).c_str());
-	return g_key_setting_cache.find(settingname)->getValue();
+	if(n != g_key_setting_cache.end())
+		return n->second;
+	g_key_setting_cache[settingname] = g_settings->get(settingname).c_str();
+	return g_key_setting_cache.find(settingname)->second;
 }
 
 void clearKeyCache()