Noise: Fix interpolation at negative coordinates

[dragonfireclient.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 8aadab2f17b6f79371c80a660c947e7df3bd753c..1ec325961bbcbfd3859db9c94315780fef475de9 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -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
 {
@@ -262,7 +262,8 @@ KeyPress::KeyPress(const char *name)
                        m_name = name;
                        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 +275,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 +286,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 +336,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 +348,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()