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

Don't show a map on bmap revert

Browse source 
Before, it showed a map, but only when the player confirmed the
revert.
This commit is contained in:
Markus Armbruster 2011-04-09 20:34:22 +02:00
parent 6b498f3908
commit 33ac27777a
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/lib/subs/maps.c
View file

@ -63,6 +63,7 @@
/* whether to highlight own sectors */ /* whether to highlight own sectors */
#define MAP_HIGH bit(4) #define MAP_HIGH bit(4)
static int revert_bmap(struct nstr_sect *);
static int draw_map(int, char, int, struct nstr_sect *); static int draw_map(int, char, int, struct nstr_sect *);
static int bmnxtsct(struct nstr_sect *); static int bmnxtsct(struct nstr_sect *);
static char map_char(int, natid, int); static char map_char(int, natid, int);
@ -130,9 +131,23 @@ do_map(int bmap, int unit_type, char *arg, char *map_flags_arg)
return RET_SYN; return RET_SYN;
} }
} }
if (bmap == 'r')
return revert_bmap(&ns);
return draw_map(bmap, origin, map_flags, &ns); return draw_map(bmap, origin, map_flags, &ns);
} }
static int
revert_bmap(struct nstr_sect *nsp)
{
if (!confirm("Are you sure you want to revert your bmap? "))
return RET_OK;
while (bmnxtsct(nsp))
player->bmap[nsp->id] = player->map[nsp->id];
ef_write(EF_BMAP, player->cnum, player->bmap);
return RET_OK;
}
static int static int
draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp) draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
{ {
@ -171,10 +186,6 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
return RET_FAIL; return RET_FAIL;
} }
if (bmap == 'r') {
if (!confirm("Are you sure you want to revert your bmap? "))
return RET_OK;
}
if (!(player->command->c_flags & C_MOD)) { if (!(player->command->c_flags & C_MOD)) {
logerror("%s command needs C_MOD flag set", logerror("%s command needs C_MOD flag set",
player->command->c_form); player->command->c_form);
@ -204,15 +215,6 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
wmap[nsp->dy][nsp->dx] = c; wmap[nsp->dy][nsp->dx] = c;
} }
break; break;
case 'r':
while (bmnxtsct(nsp)) {
player->bmap[nsp->id] =
player->map[nsp->id];
if (0 != (c = player->bmap[nsp->id]))
wmap[nsp->dy][nsp->dx] = c;
}
ef_write(EF_BMAP, player->cnum, player->bmap);
break;
case 'n': case 'n':
{ {
struct sctstr sect; struct sctstr sect;