COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / global / ship.c

diff --git a/src/lib/global/ship.c b/src/lib/global/ship.c
index d10403091f9ced603f2f67eadcf349923bf1e2ee..cf912200473469ac2a89ac22fef71f55562a3920 100644 (file)
--- a/src/lib/global/ship.c
+++ b/src/lib/global/ship.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -38,13 +38,15 @@
 /*
  * marine characteristics -- ship capabilities descriptions
  * 
- * Note, that you should not set the flags M_XLIGHT, M_UNIT, or M_CHOPPER
+ * Note, that you should not set the flags M_XLIGHT or M_CHOPPER
  * here.  They will be automatically set by init_global() when the server
  * starts if the ship can carry a non-zero amount of those things.
  * Also note that if nplanes > 0 and M_FLY is not set, then M_MSL will
  * automatically be set.
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "ship.h"
 
@@ -57,11 +59,11 @@ struct mchrstr mchr[] = {
 
     {{300,  10,   0,   0,   0,   0,   0,   0, 900,   0,   0,   0,  15,   0},
      25, 15, 10, 10, 15, 2, 0, 0, 0, 0, 0, 0, "fb   fishing boat",
-     0, 180, M_FOOD, 0, 0},
+     0, 180, M_FOOD | M_CANAL, 0, 0},
 
     {{300,  10,   0,   0,   0,   0,   0,   0, 900,   0,   0,   0,  15,   0},
      25, 15, 10, 25, 15, 2, 0, 0, 0, 0, 20, 1, "ft   fishing trawler",
-     35, 300, M_FOOD, 0, 0},
+     35, 300, M_FOOD | M_CANAL, 0, 0},
 
     {{600,  50, 300,  50,   0,   0,   0,   0, 900,   0,1400, 900, 250,   0},
      60, 40, 20, 25, 35, 3, 0, 0, 1, 0, 0, 0, "cs   cargo ship",
@@ -85,7 +87,7 @@ struct mchrstr mchr[] = {
 
     {{10,   5,   0,   0,   0,   0,   0,   0, 100,   1,   0,   0,   0,   0},
      25, 15, 10, 25, 15, 2, 0, 0, 0, 0, 20, 1, "oe   oil exploration boat",
-     40, 800, M_OIL, 0, 0},
+     40, 800, M_OIL | M_CANAL, 0, 0},
 
     {{990,  80,   0,   0,   0,   0,   0,   0, 990, 990,   0,   0, 990,   0},
      60, 60, 30, 15, 65, 3, 0, 0, 2, 0, 0, 0, "od   oil derrick",
@@ -93,7 +95,7 @@ struct mchrstr mchr[] = {
 
     {{0,   2,  12,   2,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0},
      20, 10, 10, 38, 10, 2, 1, 1, 0, 0, 4, 1, "pt   patrol boat",
-     40, 300, M_TORP, 0, 0},
+     40, 300, M_TORP | M_CANAL, 0, 0},
 
     {{0, 100,  40,   5,   0,   0,   0,   0, 100,   0,   0,   0,   0,   0},
      30, 40, 50, 30, 30, 5, 6, 3, 1, 0, 40, 1, "lc   light cruiser",
@@ -121,7 +123,7 @@ struct mchrstr mchr[] = {
 
     {{0,  10, 100,   1,   0,   0,   0,   0,  90,   0,   0,   0,   0,   0},
      25, 15, 10, 25, 15, 2, 0, 0, 0, 0, 20, 1, "ms   minesweeper",
-     40, 400, M_MINE | M_SWEEP, 0, 0},
+     40, 400, M_MINE | M_SWEEP | M_CANAL, 0, 0},
 
     {{0,  60,  40,   4,   0,   0,   0,   0,  80,   0,   0,   0,   0,   0},
      30, 30, 45, 35, 20, 4, 6, 3, 1, 0, 30, 1, "dd   destroyer",