COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / commands / payo.c

diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c
index 08269e2dbc937bab18c7db61ad84d12e496bf2e1..bf735bfa029d0422e81d584772dd4adcdf7bbeac 100644 (file)
--- a/src/lib/commands/payo.c
+++ b/src/lib/commands/payo.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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.
  *
  *  ---
  *
@@ -31,9 +31,10 @@
  *     Thomas Ruschak, 1992
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
@@ -62,13 +63,9 @@ payo(void)
        return RET_SYN;
 
     nships = 0;
-    while (nxtitem(&ni, (s_char *)&ship)) {
+    while (nxtitem(&ni, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
-       if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
-           pr("bad ship type %d (#%d)\n", ship.shp_type, ni.cur);
-           continue;
-       }
        mp = &mchr[(int)ship.shp_type];
 
        if (!(mp->m_flags & M_TRADE))