From a6fe494ff40e7c2d8e3fbf9e347348c79705a406 Mon Sep 17 00:00:00 2001
From: Steffen Mecke <stm2@users.sf.net>
Date: Sat, 14 Nov 2015 16:14:24 +0100
Subject: [PATCH] error msg for movement should contain FOLLOW SHIP order
 http://bugs.eressea.de/view.php?id=2161

---
 src/move.c   | 24 ++++++++++++------------
 src/move.h   |  3 ++-
 src/piracy.c |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/move.c b/src/move.c
index 00752c3cf..3eb0fb5dc 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1702,14 +1702,14 @@ static const region_list *travel_route(unit * u,
     return iroute;
 }
 
-static bool ship_ready(const region * r, unit * u)
+static bool ship_ready(const region * r, unit * u, order * ord)
 {
     if (!u->ship || u != ship_owner(u->ship)) {
-        cmistake(u, u->thisorder, 146, MSG_MOVE);
+        cmistake(u, ord, 146, MSG_MOVE);
         return false;
     }
     if (effskill(u, SK_SAILING, r) < u->ship->type->cptskill) {
-        ADDMSG(&u->faction->msgs, msg_feedback(u, u->thisorder,
+        ADDMSG(&u->faction->msgs, msg_feedback(u, ord,
             "error_captain_skill_low", "value ship", u->ship->type->cptskill,
             u->ship));
         return false;
@@ -1717,16 +1717,16 @@ static bool ship_ready(const region * r, unit * u)
     if (u->ship->type->construction) {
         assert(!u->ship->type->construction->improvement);     /* sonst ist construction::size nicht ship_type::maxsize */
         if (u->ship->size != u->ship->type->construction->maxsize) {
-            cmistake(u, u->thisorder, 15, MSG_MOVE);
+            cmistake(u, ord, 15, MSG_MOVE);
             return false;
         }
     }
     if (!enoughsailors(u->ship, crew_skill(u->ship))) {
-        cmistake(u, u->thisorder, 1, MSG_MOVE);
+        cmistake(u, ord, 1, MSG_MOVE);
         return false;
     }
     if (!cansail(r, u->ship)) {
-        cmistake(u, u->thisorder, 18, MSG_MOVE);
+        cmistake(u, ord, 18, MSG_MOVE);
         return false;
     }
     return true;
@@ -1808,7 +1808,7 @@ sail(unit * u, order * ord, bool move_on_land, region_list ** routep)
         return;
     }
 
-    if (!ship_ready(starting_point, u))
+    if (!ship_ready(starting_point, u, ord))
         return;
 
     /* Wir suchen so lange nach neuen Richtungen, wie es geht. Diese werden
@@ -2265,13 +2265,13 @@ static void travel(unit * u, region_list ** routep)
     }
 }
 
-void move_cmd(unit * u, bool move_on_land)
+void move_cmd(unit * u, order * ord, bool move_on_land)
 {
     region_list *route = NULL;
 
     assert(u->number);
     if (u->ship && u == ship_owner(u->ship)) {
-        sail(u, u->thisorder, move_on_land, &route);
+        sail(u, ord, move_on_land, &route);
     }
     else {
         travel(u, &route);
@@ -2389,7 +2389,7 @@ static int follow_ship(unit * u, order * ord)
     init_tokens_str(command);
     getstrtoken();
     /* NACH ausführen */
-    move_cmd(u, false);
+    move_cmd(u, ord, false);
     return 1;                     /* true -> Einheitenliste von vorne durchgehen */
 }
 
@@ -2556,13 +2556,13 @@ void movement(void)
                         if (ships) {
                             if (u->ship && ship_owner(u->ship) == u) {
                                 init_order(u->thisorder);
-                                move_cmd(u, false);
+                                move_cmd(u, u->thisorder, false);
                             }
                         }
                         else {
                             if (!u->ship || ship_owner(u->ship) != u) {
                                 init_order(u->thisorder);
-                                move_cmd(u, false);
+                                move_cmd(u, u->thisorder, false);
                             }
                         }
                     }
diff --git a/src/move.h b/src/move.h
index c0b92d071..a684b19da 100644
--- a/src/move.h
+++ b/src/move.h
@@ -30,6 +30,7 @@ extern "C" {
     struct region_list;
     struct ship;
     struct building_type;
+    struct order;
 
     extern struct attrib_type at_shiptrail;
 
@@ -75,7 +76,7 @@ extern "C" {
     bool move_blocked(const struct unit *u, const struct region *src,
         const struct region *dest);
     bool can_takeoff(const struct ship * sh, const struct region * from, const struct region * to);
-    void move_cmd(struct unit * u, bool move_on_land);
+    void move_cmd(struct unit * u, struct order * ord, bool move_on_land);
 
 #define SA_HARBOUR 2
 #define SA_COAST 1
diff --git a/src/piracy.c b/src/piracy.c
index 8911f0882..e9bcb6105 100644
--- a/src/piracy.c
+++ b/src/piracy.c
@@ -198,7 +198,7 @@ void piracy_cmd(unit * u, order *ord)
 
     /* Bewegung ausführen */
     init_order(u->thisorder);
-    move_cmd(u, true);
+    move_cmd(u, ord, true);
 }
 
 void age_piracy(region *r) {