From 8edaf89adfcf0375f42cd2c4137d1eab425c2c62 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 17 Jul 2014 11:26:32 +0300
Subject: Allow to set move to target distance from 1 to 9.

---
 src/being/localplayer.cpp | 31 ++++++++++++-------------------
 src/defaults.cpp          |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index aed7ff767..8ca76526e 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1138,28 +1138,12 @@ void LocalPlayer::moveToTarget(int dist)
         {
             switch (mMoveToTargetType)
             {
-                case 1:
-                    dist = 1;
-                    break;
-                case 2:
-                    dist = 2;
-                    break;
-                case 3:
-                    dist = 3;
-                    break;
-                case 4:
-                    dist = 5;
-                    break;
-                case 5:
-                    dist = 7;
-                    break;
-                case 6:
-                case 7:
+                case 10:
                     dist = mAttackRange;
                     if (dist == 1 && serverVersion < 1)
                         dist = 2;
                     break;
-                case 8:
+                case 11:
                     dist = mAttackRange - 1;
                     if (dist < 1)
                         dist = 1;
@@ -1167,6 +1151,7 @@ void LocalPlayer::moveToTarget(int dist)
                         dist = 2;
                     break;
                 default:
+                    dist = mMoveToTargetType;
                     break;
             }
         }
@@ -1333,7 +1318,7 @@ std::string LocalPlayer::getCrazyMoveTypeString()
     }
 }
 
-static const unsigned moveToTargetTypeSize = 9;
+static const unsigned moveToTargetTypeSize = 13;
 
 void LocalPlayer::changeMoveToTargetType()
 {
@@ -1352,10 +1337,18 @@ static const char *const moveToTargetTypeStrings[] =
     // TRANSLATORS: move to target type in status bar
     N_("(3) moves to target in distance 3"),
     // TRANSLATORS: move to target type in status bar
+    N_("(4) moves to target in distance 4"),
+    // TRANSLATORS: move to target type in status bar
     N_("(5) moves to target in distance 5"),
     // TRANSLATORS: move to target type in status bar
+    N_("(6) moves to target in distance 6"),
+    // TRANSLATORS: move to target type in status bar
     N_("(7) moves to target in distance 7"),
     // TRANSLATORS: move to target type in status bar
+    N_("(8) moves to target in distance 8"),
+    // TRANSLATORS: move to target type in status bar
+    N_("(9) moves to target in distance 9"),
+    // TRANSLATORS: move to target type in status bar
     N_("(A) moves to target in attack range"),
     // TRANSLATORS: move to target type in status bar
     N_("(a) archer attack range"),
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 386b58c5f..8e2d11eb8 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -99,7 +99,7 @@ DefaultsData* getConfigDefaults()
     AddDEF("imitationMode", 0);
     AddDEF("syncPlayerMove", false);
     AddDEF("drawPath", false);
-    AddDEF("moveToTargetType", 6);
+    AddDEF("moveToTargetType", 10);
     AddDEF("crazyMoveProgram", "mumrsonmdmlon");
     AddDEF("disableGameModifiers", false);
     AddDEF("targetDeadPlayers", false);
-- 
cgit v1.2.3-60-g2f50