COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / update / nav_ship.c

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index d7716e845ecca23bfb95a2fbcf725a8722a7f038..9907e012e358f6316e455d72dae6856cfcd3f4ab 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_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.
  *
  *  ---
  *
@@ -32,6 +32,8 @@
  *     Ken Stevens, 1995
  */
 
+#include <config.h>
+
 #include "misc.h"
 
 #include <ctype.h>
@@ -191,8 +193,7 @@ nav_loadship(struct shpstr *sp, natid cnum)
            didsomething[i] = 1;
            continue;
        }
-       if (sectp->sct_type != SCT_HARBR &&
-           !IS_BIG_CITY(sectp->sct_type)) {
+       if (!sect_has_dock(sectp)) {
            /* we can only load in harbors */
            didsomething[i] = 1;
            continue;