Some Updates

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

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 48b94ae955df649916d00dadfe6c99ebb69dd672..edf2056d0addd153852560213af6d1bf4b5d7416 100644 (file)
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -21,6 +21,86 @@ 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()
+{
+       key[KeyType::ESC] = EscapeKey;
+}
+
+void KeyCache::populate()
+{
+       key[KeyType::FORWARD] = getKeySetting("keymap_forward");
+       key[KeyType::BACKWARD] = getKeySetting("keymap_backward");
+       key[KeyType::LEFT] = getKeySetting("keymap_left");
+       key[KeyType::RIGHT] = getKeySetting("keymap_right");
+       key[KeyType::JUMP] = getKeySetting("keymap_jump");
+       key[KeyType::SPECIAL1] = getKeySetting("keymap_special1");
+       key[KeyType::SNEAK] = getKeySetting("keymap_sneak");
+
+       key[KeyType::AUTOFORWARD] = getKeySetting("keymap_autoforward");
+
+       key[KeyType::DROP] = getKeySetting("keymap_drop");
+       key[KeyType::INVENTORY] = getKeySetting("keymap_inventory");
+       key[KeyType::SPECIAL_INVENTORY] = getKeySetting("keymap_special_inventory");
+       key[KeyType::CHAT] = getKeySetting("keymap_chat");
+       key[KeyType::CMD] = getKeySetting("keymap_cmd");
+       key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local");
+       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");
+       key[KeyType::HOTBAR_NEXT] = getKeySetting("keymap_hotbar_next");
+       key[KeyType::MUTE] = getKeySetting("keymap_mute");
+       key[KeyType::INC_VOLUME] = getKeySetting("keymap_increase_volume");
+       key[KeyType::DEC_VOLUME] = getKeySetting("keymap_decrease_volume");
+       key[KeyType::CINEMATIC] = getKeySetting("keymap_cinematic");
+       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_FOG] = getKeySetting("keymap_toggle_fog");
+       key[KeyType::TOGGLE_CHEAT_MENU] = getKeySetting("keymap_toggle_cheat_menu");
+       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");
+       key[KeyType::CAMERA_MODE] = getKeySetting("keymap_camera_mode");
+       key[KeyType::INCREASE_VIEWING_RANGE] =
+                       getKeySetting("keymap_increase_viewing_range_min");
+       key[KeyType::DECREASE_VIEWING_RANGE] =
+                       getKeySetting("keymap_decrease_viewing_range_min");
+       key[KeyType::RANGESELECT] = getKeySetting("keymap_rangeselect");
+       key[KeyType::ZOOM] = getKeySetting("keymap_zoom");
+       key[KeyType::KILLAURA] = getKeySetting("keymap_toggle_killaura");
+       key[KeyType::FREECAM] = getKeySetting("keymap_toggle_freecam");
+       key[KeyType::SELECT_UP] = getKeySetting("keymap_select_up");
+       key[KeyType::SELECT_DOWN] = getKeySetting("keymap_select_down");
+       key[KeyType::SELECT_LEFT] = getKeySetting("keymap_select_left");
+       key[KeyType::SELECT_RIGHT] = getKeySetting("keymap_select_right");
+       key[KeyType::SELECT_CONFIRM] = getKeySetting("keymap_select_confirm");
+
+       key[KeyType::QUICKTUNE_NEXT] = getKeySetting("keymap_quicktune_next");
+       key[KeyType::QUICKTUNE_PREV] = getKeySetting("keymap_quicktune_prev");
+       key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
+       key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
+
+       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());
+       }
+
+       if (handler) {
+               // First clear all keys, then re-add the ones we listen for
+               handler->dontListenForKeys();
+               for (const KeyPress &k : key) {
+                       handler->listenForKey(k);
+               }
+               handler->listenForKey(EscapeKey);
+               handler->listenForKey(CancelKey);
+       }
+}
 
 bool MyEventReceiver::OnEvent(const SEvent &event)
 {
@@ -116,3 +196,72 @@ s32 RandomInputHandler::Rand(s32 min, s32 max)
 {
        return (myrand() % (max - min + 1)) + min;
 }
+
+void RandomInputHandler::step(float dtime)
+{
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 40);
+                       keydown.toggle(getKeySetting("keymap_jump"));
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 40);
+                       keydown.toggle(getKeySetting("keymap_special1"));
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 40);
+                       keydown.toggle(getKeySetting("keymap_forward"));
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 40);
+                       keydown.toggle(getKeySetting("keymap_left"));
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 20);
+                       mousespeed = v2s32(Rand(-20, 20), Rand(-15, 20));
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 30);
+                       leftdown = !leftdown;
+                       if (leftdown)
+                               leftclicked = true;
+                       if (!leftdown)
+                               leftreleased = true;
+               }
+       }
+       {
+               static float counter1 = 0;
+               counter1 -= dtime;
+               if (counter1 < 0.0) {
+                       counter1 = 0.1 * Rand(1, 15);
+                       rightdown = !rightdown;
+                       if (rightdown)
+                               rightclicked = true;
+                       if (!rightdown)
+                               rightreleased = true;
+               }
+       }
+       mousepos += mousespeed;
+}