diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-03-06 20:21:51 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-03-07 22:41:47 +1000 |
| commit | ced6d20295a8263757d57c02a07ffcb66688a163 (patch) | |
| tree | a44527357c1ffccb88bf479686735aef168d15c1 /src/keycode.cpp | |
| parent | a603a767877b94b4d3bc4d3de8d762fbc56a583d (diff) | |
| download | minetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.gz minetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.bz2 minetest-ced6d20295a8263757d57c02a07ffcb66688a163.zip | |
For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives
Diffstat (limited to 'src/keycode.cpp')
| -rw-r--r-- | src/keycode.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/keycode.cpp b/src/keycode.cpp index 27d0b6d50..d9fc88934 100644 --- a/src/keycode.cpp +++ b/src/keycode.cpp @@ -263,7 +263,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 +276,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 +287,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]; } |