projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c3c965
)
Fix camera updates being toggled by N key in release mode (#2762)
author
Kahrl
<kahrl@gmx.net>
Fri, 7 Aug 2015 04:02:06 +0000
(06:02 +0200)
committer
Kahrl
<kahrl@gmx.net>
Fri, 7 Aug 2015 04:02:06 +0000
(06:02 +0200)
src/defaultsettings.cpp
patch
|
blob
|
history
src/keycode.cpp
patch
|
blob
|
history
diff --git
a/src/defaultsettings.cpp
b/src/defaultsettings.cpp
index 4674b2b77fb7c23a0f613d66c17e1869abeec175..40afc7dd353d33bae6ebaf01455f092ccd6ef6a2 100644
(file)
--- a/
src/defaultsettings.cpp
+++ b/
src/defaultsettings.cpp
@@
-58,7
+58,7
@@
void set_default_settings(Settings *settings)
#if DEBUG
"KEY_F4");
#else
- "
none
");
+ "");
#endif
settings->setDefault("keymap_toggle_debug", "KEY_F5");
settings->setDefault("keymap_toggle_profiler", "KEY_F6");
diff --git
a/src/keycode.cpp
b/src/keycode.cpp
index 1ec325961bbcbfd3859db9c94315780fef475de9..990dee339df12113ec3e5d059e7869c7d1984ffb 100644
(file)
--- a/
src/keycode.cpp
+++ b/
src/keycode.cpp
@@
-256,7
+256,11
@@
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;