COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index 4a2ae0e4320eef24f732f2a2b5f5accb21737be3..8c5579e44bea0e76f91c67221a27571c7dd44a66 100644 (file)
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.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,48 +31,45 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
-#include "item.h"
 #include "xy.h"
 #include "path.h"
 #include "nsc.h"
-#include "deity.h"
-#include "file.h"
 #include "nat.h"
 #include "commands.h"
 
 int
 bdes(void)
 {
-        s_char    *p, d;
-        struct  nstr_sect nstr;
-       struct  sctstr sect;
-       s_char  prompt[128];
-       s_char  buf[1024];
-       int     changed = 0;
+    s_char *p, d;
+    struct nstr_sect nstr;
+    struct sctstr sect;
+    s_char prompt[128];
+    s_char buf[1024];
+    int changed = 0;
 
-        if (!snxtsct(&nstr, player->argp[1]))
-                return RET_SYN;
-        while (!player->aborted && nxtsct(&nstr, &sect)) {
-                if ((nstr.ncond > 0) && (sect.sct_own != player->cnum))
-                       continue;
-                d = player->map[sctoff(nstr.x, nstr.y)];
-                sprintf(prompt, "%s '%c'  desig? ",
-                       xyas(nstr.x, nstr.y, player->cnum), d);
-                if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
-                        continue;
-                if (!isprint(*p)){
-                        pr("Bad character. Must be printable!\n");
-                        continue;
-                }
-                changed |= map_set(player->cnum, nstr.x, nstr.y, *p, 2);
-        }
-       if (changed)
-               writebmap(player->cnum);
-       return RET_OK;
+    if (!snxtsct(&nstr, player->argp[1]))
+       return RET_SYN;
+    while (!player->aborted && nxtsct(&nstr, &sect)) {
+       if ((nstr.ncond > 0) && (sect.sct_own != player->cnum))
+           continue;
+       d = player->map[sctoff(nstr.x, nstr.y)];
+       sprintf(prompt, "%s '%c'  desig? ",
+               xyas(nstr.x, nstr.y, player->cnum),
+               d ? d : ' ');
+       if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
+           continue;
+       if (!isprint(*p)) {
+           pr("Bad character. Must be printable!\n");
+           continue;
+       }
+       changed |= map_set(player->cnum, nstr.x, nstr.y, *p, 2);
+    }
+    if (changed)
+       writebmap(player->cnum);
+    return RET_OK;
 }
-
-