Textures: Load base pack only as last fallback (#8974)

[dragonfireclient.git] / src / client / inputhandler.cpp

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 95d9fef718da716e4626d5686c4bacd1af7f045d..a79b04a9058dcf8910859c3c83d518f458ab5273 100644 (file)
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/numeric.h"
 #include "inputhandler.h"
 #include "gui/mainmenumanager.h"
+#include "hud.h"
 
 void KeyCache::populate_nonchanging()
 {
@@ -47,6 +48,7 @@ void KeyCache::populate()
        key[KeyType::CONSOLE] = getKeySetting("keymap_console");
        key[KeyType::MINIMAP] = getKeySetting("keymap_minimap");
        key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove");
+       key[KeyType::PITCHMOVE] = getKeySetting("keymap_pitchmove");
        key[KeyType::FASTMOVE] = getKeySetting("keymap_fastmove");
        key[KeyType::NOCLIP] = getKeySetting("keymap_noclip");
        key[KeyType::HOTBAR_PREV] = getKeySetting("keymap_hotbar_previous");
@@ -58,7 +60,7 @@ void KeyCache::populate()
        key[KeyType::SCREENSHOT] = getKeySetting("keymap_screenshot");
        key[KeyType::TOGGLE_HUD] = getKeySetting("keymap_toggle_hud");
        key[KeyType::TOGGLE_CHAT] = getKeySetting("keymap_toggle_chat");
-       key[KeyType::TOGGLE_FORCE_FOG_OFF] = getKeySetting("keymap_toggle_force_fog_off");
+       key[KeyType::TOGGLE_FOG] = getKeySetting("keymap_toggle_fog");
        key[KeyType::TOGGLE_UPDATE_CAMERA] = getKeySetting("keymap_toggle_update_camera");
        key[KeyType::TOGGLE_DEBUG] = getKeySetting("keymap_toggle_debug");
        key[KeyType::TOGGLE_PROFILER] = getKeySetting("keymap_toggle_profiler");
@@ -75,7 +77,7 @@ void KeyCache::populate()
        key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
        key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
 
-       for (int i = 0; i < 23; i++) {
+       for (int i = 0; i < HUD_HOTBAR_ITEMCOUNT_MAX; i++) {
                std::string slot_key_name = "keymap_slot" + std::to_string(i + 1);
                key[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
        }