Performance improvement: Use std::list instead of std::vector for request_media,...

[oweals/minetest.git] / src / keycode.cpp

diff --git a/src/keycode.cpp b/src/keycode.cpp
index 8aadab2f17b6f79371c80a660c947e7df3bd753c..27d0b6d500eb3fefd419df387d0f07bc540db361 100644 (file)
--- a/src/keycode.cpp
+++ b/src/keycode.cpp
@@ -22,7 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "exceptions.h"
 #include "settings.h"
 #include "log.h"
-#include "hex.h"
+#include "debug.h"
+#include "util/hex.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -334,6 +335,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 +347,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()