Don't show a map on bmap revert

Before, it showed a map, but only when the player confirmed the
revert.

diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 3ee12f7c23240c174d8d7a82276cba25192b648b..8c3acff009c2cadc216239f24c9bbe450778e05b 100644 (file)
--- a/src/lib/subs/maps.c
+++ b/src/lib/subs/maps.c
@@ -63,6 +63,7 @@
 /* whether to highlight own sectors */
 #define MAP_HIGH       bit(4)
 
+static int revert_bmap(struct nstr_sect *);
 static int draw_map(int, char, int, struct nstr_sect *);
 static int bmnxtsct(struct nstr_sect *);
 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;
        }
     }
+
+    if (bmap == 'r')
+       return revert_bmap(&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
 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;
     }
 
-    if (bmap == 'r') {
-       if (!confirm("Are you sure you want to revert your bmap? "))
-           return RET_OK;
-    }
     if (!(player->command->c_flags & C_MOD)) {
        logerror("%s command needs C_MOD flag set",
                 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;
            }
            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':
            {
                struct sctstr sect;