From 8bee14a0ea9e2065a0c16306b74e2272e364f0ae Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 31 Jul 2005 09:12:36 +0000
Subject: [PATCH] translated two more ship movement messages to english.

---
 src/common/kernel/eressea.c  |  2 --
 src/common/kernel/movement.c | 30 +++++++-----------------------
 src/common/util/resolve.h    |  2 +-
 src/res/messages.xml         | 26 ++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index dcde05d1f..d740c3c6b 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -1219,7 +1219,6 @@ count_all(const faction * f)
 int
 count_migrants (const faction * f)
 {
-#ifndef NDEBUG
   unit *u = f->units;
   int n = 0;
   while (u) {
@@ -1231,7 +1230,6 @@ count_migrants (const faction * f)
     }
     u = u->nextF;
   }
-#endif
   return n;
 }
 
diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c
index 7acac44c4..8216d6c57 100644
--- a/src/common/kernel/movement.c
+++ b/src/common/kernel/movement.c
@@ -1580,18 +1580,8 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
         if (tnext != T_OCEAN) {
           if (!move_on_land) {
             /* check that you're not traveling from one land region to another. */
-            plane *pl = getplane(next_point);
-
-            if (pl!=NULL && fval(pl, PFL_NOCOORDS)) {
-              /* we don't have that case yet, but hey... */
-              sprintf(buf, "Die %s entdeckt, daß im %s Festland ist.",
-                shipname(sh), locale_string(u->faction->locale, directions[dir]));
-            } else {
-              sprintf(buf, "Die %s entdeckt, daß (%d,%d) Festland ist.",
-                shipname(sh), region_x(next_point,u->faction),
-                region_y(next_point,u->faction));
-            }
-            addmessage(0, u->faction, buf, MSG_MOVE, ML_WARN);
+            ADDMSG(&u->faction->msgs, msg_message("shipnoshore",
+              "ship region", sh, next_point));
             break;
           }
         } else {
@@ -1687,17 +1677,11 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
     set_order(&u->thisorder, NULL);
     set_coast(sh, last_point, current_point);
 
-    sprintf(buf, "Die %s ", shipname(sh));
-    if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) )
-      scat("fliegt");
-    else
-      scat("segelt");
-    scat(" von ");
-    scat(regionname(starting_point, u->faction));
-    scat(" nach ");
-    scat(regionname(current_point, u->faction));
-    scat(".");
-    addmessage(0, u->faction, buf, MSG_MOVE, ML_INFO);
+    if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
+      ADDMSG(&f->msgs, msg_message("shipfly", "ship from to", sh, starting_point, current_point));
+    } else {
+      ADDMSG(&f->msgs, msg_message("shipsail", "ship from to", sh, starting_point, current_point));
+    }
 
     /* Das Schiff und alle Einheiten darin werden nun von
     * starting_point nach current_point verschoben */
diff --git a/src/common/util/resolve.h b/src/common/util/resolve.h
index e58b0a011..c07df7d30 100644
--- a/src/common/util/resolve.h
+++ b/src/common/util/resolve.h
@@ -15,7 +15,7 @@
 #ifndef RESOLVE_H
 #define RESOLVE_H
 
-#include <util/variant.h>
+#include "variant.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/res/messages.xml b/src/res/messages.xml
index c5aa0d19f..d537d9599 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -2632,6 +2632,32 @@
     <text locale="fr">"The $ship($ship) suffers too heavy damage and sinks."</text>
     <text locale="en">"The $ship($ship) suffers too heavy damage and sinks."</text>
   </message>
+  <message name="shipnoshore" section="movement">
+    <type>
+      <arg name="ship" type="ship"/>
+      <arg name="region" type="region"/>
+    </type>
+    <text locale="de">"Die $ship($ship) entdeckt, dass $region($region) Festland ist."</text>
+    <text locale="en">"The $ship($ship) discovers that $region($region) has no shore."</text>
+  </message>
+  <message name="shipfly" section="movement">
+    <type>
+      <arg name="ship" type="ship"/>
+      <arg name="from" type="region"/>
+      <arg name="to" type="region"/>
+    </type>
+    <text locale="de">"Die $ship($ship) fliegt von $region($from) nach $region($to)."</text>
+    <text locale="en">"The $ship($ship) flies from $region($from) to $region($to)."</text>
+  </message>
+  <message name="shipsail" section="movement">
+    <type>
+      <arg name="ship" type="ship"/>
+      <arg name="from" type="region"/>
+      <arg name="to" type="region"/>
+    </type>
+    <text locale="de">"Die $ship($ship) segelt von $region($from) nach $region($to)."</text>
+    <text locale="en">"The $ship($ship) sails from $region($from) to $region($to)."</text>
+  </message>
   <message name="shipnoconf" section="events">
     <type>
       <arg name="ship" type="ship"/>