Merge pull request #1 from TeddyDesTodes/master

+ submenu for key assignment, fast_move and free_move can now be toggled

1 files changed, 22 insertions, 0 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 603a86da3..7970a6ed9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1147,6 +1147,28 @@ void the_game(
 					&g_menumgr, dest,
 					L""))->drop();
 		}
+		else if(input->wasKeyDown(getKeySetting("keymap_freemove")))
+		{
+			if(g_settings.getBool("free_move"))
+			{
+				g_settings.set("free_move","false");
+			}
+			else
+			{
+				g_settings.set("free_move","true");
+			}
+		}
+		else if(input->wasKeyDown(getKeySetting("keymap_fastmove")))
+		{
+			if(g_settings.getBool("fast_move"))
+			{
+				g_settings.set("fast_move","false");
+			}
+			else
+			{
+				g_settings.set("fast_move","true");
+			}
+		}
 
 		// Item selection with mouse wheel
 		{