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 25175415b560b146272ef0a7c845ac270dd2ce6a..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-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.
  *
  *  ---
  *
@@ -31,6 +31,8 @@
  *     Jeff Bailey
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "ship.h"
@@ -51,13 +53,9 @@ name(void)
     struct nstr_item nb;
     s_char buf[1024];
 
-    if (!opt_SHIPNAMES) {
-       pr("Ship naming is not enabled.\n");
-       return RET_FAIL;
-    }
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
        return RET_SYN;
-    while (nxtitem(&nb, (s_char *)&ship)) {
+    while (nxtitem(&nb, &ship)) {
        if (!player->owner)
            continue;
        p = getstarg(player->argp[2], "Name? ", buf);