License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c
index 8c5579e44bea0e76f91c67221a27571c7dd44a66..d7f689eec9d32c23a6a271fd42b29fdd3aa74115 100644 (file)
--- a/src/lib/commands/bdes.c
+++ b/src/lib/commands/bdes.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,50 +25,50 @@
  *  ---
  *
  *  bdes.c: Change bmap designations
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "path.h"
-#include "nsc.h"
-#include "nat.h"
+#include <ctype.h>
 #include "commands.h"
+#include "map.h"
+#include "path.h"
 
 int
 bdes(void)
 {
-    s_char *p, d;
+    char *p, d;
     struct nstr_sect nstr;
     struct sctstr sect;
-    s_char prompt[128];
-    s_char buf[1024];
+    char prompt[128];
+    char buf[1024];
     int changed = 0;
+    int rc = RET_OK;
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
-    while (!player->aborted && nxtsct(&nstr, &sect)) {
+    while (nxtsct(&nstr, &sect)) {
        if ((nstr.ncond > 0) && (sect.sct_own != player->cnum))
            continue;
-       d = player->map[sctoff(nstr.x, nstr.y)];
+       d = player->map[sect.sct_uid];
        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 (!(p = getstarg(player->argp[2], prompt, buf))) {
+           rc = RET_FAIL;
+           break;
+       }
        if (!isprint(*p)) {
-           pr("Bad character. Must be printable!\n");
+           if (*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;
+    return rc;
 }