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

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.

diff --git a/include/file.h b/include/file.h
index e3d7956a2f857fe8d2cf3f8b47d36c7f93f497b3..1f405e0f0ca910cb96646991fa19d9119687c42f 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -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 *);

diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index 3e52d361345751de09bef5f333a7006a20590b1f..5c10419dc9c2a53952e8263e6cbf718da3517d90 100644 (file)
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -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:

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index bfdd4203f731c63796218070621c1c1f5926f391..e9a70159118f9535113b93c3d04f13eab1494616 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -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;

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index c571d8cd29d133197eb2043d2e88d4289ed3df45..8cc099260446f0a25bcc0bb747814d6cf2f57c0a 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -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;

diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c
index d3fd1f248e12dbeeced2852f7ca9d25295ecc8b3..251be4b56dbbe53abd6c52570e630b2141dbe846 100644 (file)
--- a/src/lib/common/maps.c
+++ b/src/lib/common/maps.c
@@ -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;