/*
* 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
*
* ---
*
- * 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.
*
* ---
*
* Ken Stevens, 1995
*/
+#include <config.h>
+
#include "misc.h"
#include "nat.h"
#include "file.h"
#include "map.h"
#include "ship.h"
#include "land.h"
-#include "plane.h"
#include "xy.h"
#include "nsc.h"
#include "commands.h"
s_char *str;
struct nstr_sect ns;
s_char origin = '\0';
- int as_country;
int map_flags = 0;
int i;
- int where = 2;
s_char what[64];
s_char buf[1024];
if (**player->argp != 'm') {
if (**player->argp == 'b')
- bmap = EF_BMAP;
+ bmap = 'b';
else if (**player->argp == 'n')
- bmap = EF_NMAP;
+ bmap = 'n';
else {
if (**player->argp == 'l')
unit_type = EF_LAND;
return RET_SYN;
}
if (player->argp[0][1] == 'b')
- bmap = EF_BMAP;
+ bmap = 'b';
}
}
- if (player->argp[1] == (s_char *)0) {
+ if (player->argp[1] == NULL) {
if ((str = getstring("(sects)? ", buf)) == 0)
return RET_SYN;
} else {
}
b = player->argp[2];
while (b != (s_char *)0 && (*b)) {
- where = 3;
switch (*b) {
case 's':
case 'S':
case '*':
map_flags |= MAP_ALL;
break;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- where = 2;
- break;
case 't':
- bmap = EF_MAP;
+ if (bmap != 'b')
+ goto bad_flag;
+ bmap = 't';
*(b + 1) = 0;
break;
case 'r':
- bmap = EF_MAP + EF_BMAP;
+ if (bmap != 'b')
+ goto bad_flag;
+ bmap = 'r';
*(b + 1) = 0;
break;
default:
+ bad_flag:
pr("Bad flag %c!\n", *b);
break;
}
b++;
}
- as_country = player->cnum;
- if (player->god) {
- if (player->argp[where] != (s_char *)0) {
- as_country = atoi(player->argp[where]);
- if ((as_country < 0) || (as_country > MAXNOC)) {
- as_country = player->cnum;
- }
- }
- }
-
- return draw_map(bmap, origin, map_flags, &ns, as_country);
+ return draw_map(bmap, origin, map_flags, &ns);
}