Add move to point configurable shortcuts.

6 files changed, 681 insertions, 36 deletions

diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index ededaea52..2c9dd775f 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -145,15 +145,18 @@ impHandler(emote)
             return true;
         }
     }
-    else if (inputManager.isActionActive(Input::KEY_MOVE_TO_POINT))
+
+    return false;
+}
+
+impHandler(moveToPoint)
+{
+    // move to point keys
+    int num = event.action - Input::KEY_MOVE_TO_POINT_1;
+    if (socialWindow && num >= 0)
     {
-        // move to point keys
-        int num = event.action - Input::KEY_EMOTE_1;
-        if (socialWindow && num >= 0)
-        {
-            socialWindow->selectPortal(num);
-            return true;
-        }
+        socialWindow->selectPortal(num);
+        return true;
     }
 
     return false;
diff --git a/src/actionmanager.h b/src/actionmanager.h
index fcd8bf23b..a453869d7 100644
--- a/src/actionmanager.h
+++ b/src/actionmanager.h
@@ -38,6 +38,7 @@ namespace ActionManager
     decHandler(moveRight);
     decHandler(emote);
     decHandler(outfit);
+    decHandler(moveToPoint);
     decHandler(mouseClick);
     decHandler(ok);
     decHandler(shortcut);
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index e88098ff3..0e120488b 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -102,7 +102,7 @@ Setup_Input::Setup_Input():
     selectedData = 0;
     mActionDataSize = new int [7];
 
-    for (int f = 0; f < 7; f ++)
+    for (int f = 0; f < 8; f ++)
     {
         int cnt = 0;
         while (!setupActionData[f][cnt].name.empty())
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index c30ffd395..c1cdbf379 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -40,31 +40,6 @@ struct SetupActionData
 static SetupActionData setupActionData0[] =
 {
     {
-        N_("Move Keys"),
-        Input::KEY_NO_VALUE,
-        "",
-    },
-    {
-        N_("Move Up"),
-        Input::KEY_MOVE_UP,
-        "",
-    },
-    {
-        N_("Move Down"),
-        Input::KEY_MOVE_DOWN,
-        "",
-    },
-    {
-        N_("Move Left"),
-        Input::KEY_MOVE_LEFT,
-        "",
-    },
-    {
-        N_("Move Right"),
-        Input::KEY_MOVE_RIGHT,
-        "",
-    },
-    {
         N_("Target and attack keys"),
         Input::KEY_NO_VALUE,
         "",
@@ -1175,9 +1150,289 @@ static SetupActionData setupActionData6[] =
     }
 };
 
+static SetupActionData setupActionData7[] =
+{
+    {
+        N_("Move Keys"),
+        Input::KEY_NO_VALUE,
+        "",
+    },
+    {
+        N_("Move Up"),
+        Input::KEY_MOVE_UP,
+        "",
+    },
+    {
+        N_("Move Down"),
+        Input::KEY_MOVE_DOWN,
+        "",
+    },
+    {
+        N_("Move Left"),
+        Input::KEY_MOVE_LEFT,
+        "",
+    },
+    {
+        N_("Move Right"),
+        Input::KEY_MOVE_RIGHT,
+        "",
+    },
+    {
+        N_("Move to navigation point shortcuts"),
+        Input::KEY_NO_VALUE,
+        ""
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 1),
+        Input::KEY_MOVE_TO_POINT_1,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 2),
+        Input::KEY_MOVE_TO_POINT_2,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 3),
+        Input::KEY_MOVE_TO_POINT_3,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 4),
+        Input::KEY_MOVE_TO_POINT_4,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 5),
+        Input::KEY_MOVE_TO_POINT_5,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 6),
+        Input::KEY_MOVE_TO_POINT_6,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 7),
+        Input::KEY_MOVE_TO_POINT_7,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 8),
+        Input::KEY_MOVE_TO_POINT_8,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 9),
+        Input::KEY_MOVE_TO_POINT_9,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 10),
+        Input::KEY_MOVE_TO_POINT_10,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 11),
+        Input::KEY_MOVE_TO_POINT_11,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 12),
+        Input::KEY_MOVE_TO_POINT_12,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 13),
+        Input::KEY_MOVE_TO_POINT_13,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 14),
+        Input::KEY_MOVE_TO_POINT_14,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 15),
+        Input::KEY_MOVE_TO_POINT_15,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 16),
+        Input::KEY_MOVE_TO_POINT_16,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 17),
+        Input::KEY_MOVE_TO_POINT_17,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 18),
+        Input::KEY_MOVE_TO_POINT_18,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 19),
+        Input::KEY_MOVE_TO_POINT_19,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 20),
+        Input::KEY_MOVE_TO_POINT_20,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 21),
+        Input::KEY_MOVE_TO_POINT_21,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 22),
+        Input::KEY_MOVE_TO_POINT_22,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 23),
+        Input::KEY_MOVE_TO_POINT_23,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 24),
+        Input::KEY_MOVE_TO_POINT_24,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 25),
+        Input::KEY_MOVE_TO_POINT_25,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 26),
+        Input::KEY_MOVE_TO_POINT_26,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 27),
+        Input::KEY_MOVE_TO_POINT_27,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 28),
+        Input::KEY_MOVE_TO_POINT_28,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 29),
+        Input::KEY_MOVE_TO_POINT_29,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 30),
+        Input::KEY_MOVE_TO_POINT_30,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 31),
+        Input::KEY_MOVE_TO_POINT_31,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 32),
+        Input::KEY_MOVE_TO_POINT_32,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 33),
+        Input::KEY_MOVE_TO_POINT_33,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 34),
+        Input::KEY_MOVE_TO_POINT_34,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 35),
+        Input::KEY_MOVE_TO_POINT_35,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 36),
+        Input::KEY_MOVE_TO_POINT_36,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 37),
+        Input::KEY_MOVE_TO_POINT_37,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 38),
+        Input::KEY_MOVE_TO_POINT_38,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 39),
+        Input::KEY_MOVE_TO_POINT_39,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 40),
+        Input::KEY_MOVE_TO_POINT_40,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 41),
+        Input::KEY_MOVE_TO_POINT_41,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 42),
+        Input::KEY_MOVE_TO_POINT_42,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 43),
+        Input::KEY_MOVE_TO_POINT_43,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 44),
+        Input::KEY_MOVE_TO_POINT_44,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 45),
+        Input::KEY_MOVE_TO_POINT_45,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 46),
+        Input::KEY_MOVE_TO_POINT_46,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 47),
+        Input::KEY_MOVE_TO_POINT_47,
+        "",
+    },
+    {
+        strprintf(N_("Move to point Shortcut %d"), 48),
+        Input::KEY_MOVE_TO_POINT_48,
+        "",
+    },
+    {
+        "",
+        Input::KEY_NO_VALUE,
+        ""
+    }
+};
+
 static SetupActionData *setupActionData[] =
 {
     setupActionData0,
+    setupActionData7,
     setupActionData1,
     setupActionData2,
     setupActionData3,
@@ -1189,6 +1444,7 @@ static SetupActionData *setupActionData[] =
 static const char *pages[] =
 {
     N_("Basic"),
+    N_("Move"),
     N_("Shortcuts"),
     N_("Windows"),
     N_("Emotes"),
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index c5a0af703..e975abe89 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -1218,6 +1218,342 @@ static KeyData const keyData[Input::KEY_TOTAL] = {
         &ActionManager::outfit,
         Input::KEY_NO_VALUE, 100,
         COND_GAME},
+    {"keyMoveToPointShortcut1",
+        INPUT_KEYBOARD, SDLK_1,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut2",
+        INPUT_KEYBOARD, SDLK_2,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut3",
+        INPUT_KEYBOARD, SDLK_3,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut4",
+        INPUT_KEYBOARD, SDLK_4,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut5",
+        INPUT_KEYBOARD, SDLK_5,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut6",
+        INPUT_KEYBOARD, SDLK_6,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut7",
+        INPUT_KEYBOARD, SDLK_7,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut8",
+        INPUT_KEYBOARD, SDLK_8,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut9",
+        INPUT_KEYBOARD, SDLK_9,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut10",
+        INPUT_KEYBOARD, SDLK_0,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut11",
+        INPUT_KEYBOARD, SDLK_MINUS,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut12",
+        INPUT_KEYBOARD, SDLK_EQUALS,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut13",
+        INPUT_KEYBOARD, SDLK_BACKSPACE,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut14",
+        INPUT_KEYBOARD, SDLK_INSERT,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut15",
+        INPUT_KEYBOARD, SDLK_HOME,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut16",
+        INPUT_KEYBOARD, SDLK_q,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut17",
+        INPUT_KEYBOARD, SDLK_w,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut18",
+        INPUT_KEYBOARD, SDLK_e,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut19",
+        INPUT_KEYBOARD, SDLK_r,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut20",
+        INPUT_KEYBOARD, SDLK_t,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut21",
+        INPUT_KEYBOARD, SDLK_y,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut22",
+        INPUT_KEYBOARD, SDLK_u,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut23",
+        INPUT_KEYBOARD, SDLK_i,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut24",
+        INPUT_KEYBOARD, SDLK_o,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut25",
+        INPUT_KEYBOARD, SDLK_p,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut26",
+        INPUT_KEYBOARD, SDLK_LEFTBRACKET,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut27",
+        INPUT_KEYBOARD, SDLK_RIGHTBRACKET,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut28",
+        INPUT_KEYBOARD, SDLK_BACKSLASH,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut29",
+        INPUT_KEYBOARD, SDLK_a,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut30",
+        INPUT_KEYBOARD, SDLK_s,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut31",
+        INPUT_KEYBOARD, SDLK_d,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut32",
+        INPUT_KEYBOARD, SDLK_f,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut33",
+        INPUT_KEYBOARD, SDLK_g,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut34",
+        INPUT_KEYBOARD, SDLK_h,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut35",
+        INPUT_KEYBOARD, SDLK_j,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut36",
+        INPUT_KEYBOARD, SDLK_k,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut37",
+        INPUT_KEYBOARD, SDLK_l,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut38",
+        INPUT_KEYBOARD, SDLK_SEMICOLON,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut39",
+        INPUT_KEYBOARD, SDLK_QUOTE,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut40",
+        INPUT_KEYBOARD, SDLK_z,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut41",
+        INPUT_KEYBOARD, SDLK_x,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut42",
+        INPUT_KEYBOARD, SDLK_c,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut43",
+        INPUT_KEYBOARD, SDLK_v,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut44",
+        INPUT_KEYBOARD, SDLK_b,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut45",
+        INPUT_KEYBOARD, SDLK_n,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut46",
+        INPUT_KEYBOARD, SDLK_m,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut47",
+        INPUT_KEYBOARD, SDLK_COMMA,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
+    {"keyMoveToPointShortcut48",
+        INPUT_KEYBOARD, SDLK_PERIOD,
+        INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+        Input::GRP_MOVETOPOINT,
+        &ActionManager::moveToPoint,
+        Input::KEY_MOVE_TO_POINT, 100,
+        COND_GAME},
     {"keyChat",
         INPUT_KEYBOARD, SDLK_RETURN,
         INPUT_UNKNOWN, Input::KEY_NO_VALUE,
diff --git a/src/keydata.h b/src/keydata.h
index 177e78dd1..39b2de69c 100644
--- a/src/keydata.h
+++ b/src/keydata.h
@@ -51,9 +51,10 @@ namespace Input
         GRP_CHAT = 2,              // chat key
         GRP_EMOTION = 4,           // emotions key
         GRP_OUTFIT = 8,            // outfit key
-        GRP_GUI = 16               // gui key
+        GRP_GUI = 16,              // gui key
+        GRP_MOVETOPOINT = 32       // move to point key
     };
-  
+
     /**
       * All the key functions.
       * KEY_NO_VALUE is used in initialization, and should be unchanged.
@@ -233,6 +234,54 @@ namespace Input
         KEY_OUTFIT_46,
         KEY_OUTFIT_47,
         KEY_OUTFIT_48,
+        KEY_MOVE_TO_POINT_1,
+        KEY_MOVE_TO_POINT_2,
+        KEY_MOVE_TO_POINT_3,
+        KEY_MOVE_TO_POINT_4,
+        KEY_MOVE_TO_POINT_5,
+        KEY_MOVE_TO_POINT_6,
+        KEY_MOVE_TO_POINT_7,
+        KEY_MOVE_TO_POINT_8,
+        KEY_MOVE_TO_POINT_9,
+        KEY_MOVE_TO_POINT_10,
+        KEY_MOVE_TO_POINT_11,
+        KEY_MOVE_TO_POINT_12,
+        KEY_MOVE_TO_POINT_13,
+        KEY_MOVE_TO_POINT_14,
+        KEY_MOVE_TO_POINT_15,
+        KEY_MOVE_TO_POINT_16,
+        KEY_MOVE_TO_POINT_17,
+        KEY_MOVE_TO_POINT_18,
+        KEY_MOVE_TO_POINT_19,
+        KEY_MOVE_TO_POINT_20,
+        KEY_MOVE_TO_POINT_21,
+        KEY_MOVE_TO_POINT_22,
+        KEY_MOVE_TO_POINT_23,
+        KEY_MOVE_TO_POINT_24,
+        KEY_MOVE_TO_POINT_25,
+        KEY_MOVE_TO_POINT_26,
+        KEY_MOVE_TO_POINT_27,
+        KEY_MOVE_TO_POINT_28,
+        KEY_MOVE_TO_POINT_29,
+        KEY_MOVE_TO_POINT_30,
+        KEY_MOVE_TO_POINT_31,
+        KEY_MOVE_TO_POINT_32,
+        KEY_MOVE_TO_POINT_33,
+        KEY_MOVE_TO_POINT_34,
+        KEY_MOVE_TO_POINT_35,
+        KEY_MOVE_TO_POINT_36,
+        KEY_MOVE_TO_POINT_37,
+        KEY_MOVE_TO_POINT_38,
+        KEY_MOVE_TO_POINT_39,
+        KEY_MOVE_TO_POINT_40,
+        KEY_MOVE_TO_POINT_41,
+        KEY_MOVE_TO_POINT_42,
+        KEY_MOVE_TO_POINT_43,
+        KEY_MOVE_TO_POINT_44,
+        KEY_MOVE_TO_POINT_45,
+        KEY_MOVE_TO_POINT_46,
+        KEY_MOVE_TO_POINT_47,
+        KEY_MOVE_TO_POINT_48,
         KEY_TOGGLE_CHAT,
         KEY_SCROLL_CHAT_UP,
         KEY_SCROLL_CHAT_DOWN,