empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(draw_map): Parameter bmap abused EF_MAP and EF_BMAP, and required the

Browse source 
silly EF_NMAP.  Use characters instead: 'b' for bmap (was EF_BMAP),
't' for true bmap (was EF_MAP), 'r' for revert (was EF_MAP+EF_BMAP,
more sillness), and 'n' for nmap (was EF_NMAP).  Callers changed.
(EF_NMAP): Remove.
This commit is contained in:
Markus Armbruster 2005-10-23 08:58:23 +00:00
parent a2ae5ebe5e
commit ba84b71f8d
5 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/file.h
View file

@ -117,9 +117,6 @@ struct empfile {
#define EF_LAND_CHR_FLAGS 27
#define EF_NUKE_CHR_FLAGS 28
#define EF_NMAP 222 /* Kinda bogus, but used to describe a newdesmap
instead of bmap or map. */
struct fileinit {
int ef_type;
void (*init) (int, char *);

14
src/lib/commands/map.c
View file

@ -62,9 +62,9 @@ map(void)
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;
@ -77,7 +77,7 @@ map(void)
return RET_SYN;
}
if (player->argp[0][1] == 'b')
bmap = EF_BMAP;
bmap = 'b';
}
}
@ -123,15 +123,15 @@ map(void)
map_flags |= MAP_ALL;
break;
case 't':
if (bmap != EF_BMAP)
if (bmap != 'b')
goto bad_flag;
bmap = EF_MAP;
bmap = 't';
*(b + 1) = 0;
break;
case 'r':
if (bmap != EF_BMAP)
if (bmap != 'b')
goto bad_flag;
bmap = EF_MAP + EF_BMAP;
bmap = 'r';
*(b + 1) = 0;
break;
default:

2
src/lib/commands/marc.c
View file

@ -122,7 +122,7 @@ march(void)
skip = 1;
} else if (cp[-1] == 'B') {
unit_map(EF_LAND, lnd->lnd_uid, &ns, &origin);
draw_map(EF_BMAP, origin, 0, &ns);
draw_map('b', origin, 0, &ns);
skip = 1;
} else if (cp[-1] == 'f') {
struct emp_qelem *qp;

2
src/lib/commands/navi.c
View file

@ -144,7 +144,7 @@ navi(void)
skip = 1;
} else if (cp[-1] == 'B') {
unit_map(EF_SHIP, shp->shp_uid, &ns, &origin);
draw_map(EF_BMAP, origin, MAP_SHIP, &ns);
draw_map('b', origin, MAP_SHIP, &ns);
skip = 1;
} else if (cp[-1] == 'f') {
struct emp_qelem *qp;

14
src/lib/common/maps.c
View file

@ -88,7 +88,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
return RET_FAIL;
}
if (bmap == EF_MAP + EF_BMAP) {
if (bmap == 'r') {
if (!confirm("Are you sure you want to revert your bmap? "))
return RET_OK;
}
@ -106,19 +106,23 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
if (bmap) {
int c;
switch (bmap) {
case EF_BMAP:
default:
CANT_HAPPEN("bad BMAP");
bmap = 'b';
/* fall through */
case 'b':
while (bmnxtsct(nsp) && !player->aborted) {
if (0 != (c = player->bmap[sctoff(nsp->x, nsp->y)]))
wmap[nsp->dy][nsp->dx] = c;
}
break;
case EF_MAP:
case 't':
while (bmnxtsct(nsp) && !player->aborted) {
if (0 != (c = player->map[sctoff(nsp->x, nsp->y)]))
wmap[nsp->dy][nsp->dx] = c;
}
break;
case (EF_MAP + EF_BMAP):
case 'r':
while (bmnxtsct(nsp) && !player->aborted) {
player->bmap[sctoff(nsp->x, nsp->y)] =
player->map[sctoff(nsp->x, nsp->y)];
@ -127,7 +131,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp)
}
ef_write(EF_BMAP, player->cnum, player->bmap);
break;
case EF_NMAP:
case 'n':
{
struct sctstr sect;