COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index ba12fa1942868bf42a4d1b4f8624fe4e63b6921c..8fde5cf72398d9030a768885145f47607ca2ce52 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.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,15 +31,12 @@
  *     Jeff Bailey
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
-#include "sect.h"
 #include "ship.h"
-#include "xy.h"
 #include "nsc.h"
-#include "nat.h"
-#include "deity.h"
 #include "file.h"
 #include "path.h"
 #include "commands.h"
@@ -51,36 +48,29 @@
 int
 name(void)
 {
-       struct  shpstr  ship;
-       s_char  *p;
-       struct nstr_item nb;
-       s_char  buf[1024];
+    struct shpstr ship;
+    s_char *p;
+    struct nstr_item nb;
+    s_char buf[1024];
 
-       if (!opt_SHIPNAMES) {
-           pr("Ship naming is not enabled.\n");
+    if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+       return RET_SYN;
+    while (nxtitem(&nb, &ship)) {
+       if (!player->owner)
+           continue;
+       p = getstarg(player->argp[2], "Name? ", buf);
+       if (!check_ship_ok(&ship))
            return RET_FAIL;
+       if (p == 0 || *p == 0)
+           return RET_SYN;
+       if (!strcmp(p, "~")) {
+           ship.shp_name[0] = 0;
+       } else {
+           strncpy(ship.shp_name, p, MAXSHPNAMLEN - 1);
+           ship.shp_name[MAXSHPNAMLEN - 1] = 0;
        }
-       if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
-               return RET_SYN;
-       while (nxtitem(&nb, (s_char *)&ship)) {
-               if (!player->owner)
-                       continue;
-               p = getstarg(player->argp[2], "Name? ", buf);
-               if (!check_ship_ok(&ship))
-                   return RET_FAIL;
-               if (p == 0 || *p == 0)
-                       return RET_SYN;
-               if (!strcmp(p,"~")) {
-                       ship.shp_name[0] = 0;
-               }
-               else
-               {
-                       strncpy(ship.shp_name,p,MAXSHPNAMLEN - 1);
-                       ship.shp_name[MAXSHPNAMLEN - 1] = 0;
-               }
-               putship(ship.shp_uid,&ship);
-       }
+       putship(ship.shp_uid, &ship);
+    }
 
-       return RET_OK;
+    return RET_OK;
 }
-