/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* bdes.c: Change bmap designations
- *
+ *
* Known contributors to this file:
- *
+ *
*/
-#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 "file.h"
-#include "nat.h"
+#include <config.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, §)) {
+ while (nxtsct(&nstr, §)) {
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);
- if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
- continue;
+ xyas(nstr.x, nstr.y, player->cnum),
+ d ? d : ' ');
+ if ((p = getstarg(player->argp[2], prompt, buf)) == 0) {
+ 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;
}