Game refactor [4/X]: keycache is now owned by InputHandler

* Make InputHandler own the key cache
* Add a helper function InputHandler::cancelPressed to avoid multiple similar calls in game.cpp
* Move RandomInputHandler::step definition into cpp file

1 files changed, 110 insertions, 47 deletions

diff --git a/src/client/inputhandler.cpp b/src/client/inputhandler.cpp
index 3b01f5d93..95d9fef71 100644
--- a/src/client/inputhandler.cpp
+++ b/src/client/inputhandler.cpp
@@ -29,57 +29,51 @@ void KeyCache::populate_nonchanging()
 
 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::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::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_FORCE_FOG_OFF]
-		= getKeySetting("keymap_toggle_force_fog_off");
-	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::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::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::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_FORCE_FOG_OFF] = getKeySetting("keymap_toggle_force_fog_off");
+	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::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");
+	key[KeyType::QUICKTUNE_INC] = getKeySetting("keymap_quicktune_inc");
+	key[KeyType::QUICKTUNE_DEC] = getKeySetting("keymap_quicktune_dec");
 
 	for (int i = 0; i < 23; i++) {
 		std::string slot_key_name = "keymap_slot" + std::to_string(i + 1);
@@ -191,3 +185,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;
+}