Noise: Fix interpolation at negative coordinates

[dragonfireclient.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 27d0b6d500eb3fefd419df387d0f07bc540db361..1ec325961bbcbfd3859db9c94315780fef475de9 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -18,7 +18,6 @@ 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"
@@ -263,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;
@@ -275,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) {};
        }
@@ -285,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];
 }