From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 18 Aug 2007 13:48:15 +0000 (+0000)
Subject: (fltelemstr, fltheadstr): Move from ship.h to sail.c.
X-Git-Tag: v4.3.10~59
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=10dd9aea11778a3f8a00799d4bb5bdb7fefc763e

(fltelemstr, fltheadstr): Move from ship.h to sail.c.
---

diff --git a/include/ship.h b/include/ship.h
index 99167fb68..bda8c6df5 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -110,27 +110,6 @@ struct shpstr {
     char shp_rpath[RET_LEN];	/* retreat path */
 };
 
-struct fltelemstr {
-    int num;
-    int own;
-    double mobil, mobcost;
-    struct fltelemstr *next;
-};
-
-struct fltheadstr {
-    int leader;
-    signed char real_q;
-/* defines for the real_q member */
-#define	LEADER_VIRTUAL	0
-#define	LEADER_REAL	1
-#define	LEADER_WRONGSECT	2
-    coord x, y;
-    natid own;
-    unsigned maxmoves;
-    struct fltelemstr *head;
-    struct fltheadstr *next;
-};
-
 struct mchrstr {
     short m_item[I_MAX+1];	/* load limit */
     int m_lcm;			/* units of lcm to build */
diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index 9009f414e..c86ff366b 100644
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -43,6 +43,27 @@
 #include "empobj.h"
 #include "unit.h"
 
+struct fltelemstr {
+    int num;
+    int own;
+    double mobil, mobcost;
+    struct fltelemstr *next;
+};
+
+struct fltheadstr {
+    int leader;
+    signed char real_q;
+/* defines for the real_q member */
+#define	LEADER_VIRTUAL	0
+#define	LEADER_REAL	1
+#define	LEADER_WRONGSECT	2
+    coord x, y;
+    natid own;
+    unsigned maxmoves;
+    struct fltelemstr *head;
+    struct fltheadstr *next;
+};
+
 static void fltp_to_list(struct fltheadstr *, struct emp_qelem *);
 
 static void