(march, navi): Provide equivalent functionality to map in move(), expl()

and tran(). Allow map and bmap to access the regular map command
parameters.

diff --git a/info/march.t b/info/march.t
index cc0115a3feace05a9898834ac8624f114b6b9e57..46b98c7b1920992b2fabb34b1e5f0f6e71e399ab 100644 (file)
--- a/info/march.t
+++ b/info/march.t
@@ -54,14 +54,14 @@ The lookout command works in the same way as radar.
 .s1
 The \*Qmap\*U command will give you a
 map surrounding the current position.
-By default, it will be around the leader,  but you may also
-specify a unit number.
-.EX <32.3: g 6,2> m 3
+By default, it will be around the leader.
+You can also supply additional parameters:
+.EX <32.3: g 6,2> M 3 ls
 .s1
 is equivalent to a \*Qlmap\*U command. like
 this:
 .EX lmap 3 ls
-The \*Qmap\*U command works in the same way,
+The \*Qbmap\*U command works in the same way,
 you get a bmap instead.
 .s1
 The \*Qleader\*U command will the change the leader.

diff --git a/info/navigate.t b/info/navigate.t
index 85e9d39c0d65c8f26b70e0bc21960f4e8437eab0..54e5b2a7a939c602568e09fb622f3bec07ca62c7 100644 (file)
--- a/info/navigate.t
+++ b/info/navigate.t
@@ -55,14 +55,14 @@ The \*Qlookout\*U and \*Qsonar\*U commands work in the same way as radar.
 .s1
 The \*Qmap\*U command will give you a
 map surrounding the current position.
-By default, it will be around the flagship,  but you may also
-specify a ship number.
-.EX <32.3: g 6,2> m 3
+By default, it will be around the flagship.
+You can also supply additional parameters:
+.EX <32.3: g 6,2>M 3 ls
 .s1
 is equivalent to a \*Qmap\*U command. like
 this:
 .EX map 3 ls
-The \*Qmap\*U command works in the same way,
+The \*Qbmap\*U command works in the same way,
 you get a bmap instead.
 .s1
 The \*Qflagship\*U command will the change the flagship.

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index b6293e34d366eaba4bf7e14cd237416991d4fc1f..87f6cb62166a51b5be55aef230bcf03b4ab2dbab 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -53,8 +53,6 @@ march(void)
     int together;
     char *cp = NULL;
     struct lndstr *lnd = NULL; /* leader */
-    struct nstr_sect ns;
-    char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
@@ -139,8 +137,7 @@ march(void)
             * fall through
             */
        case 'M':
-           unit_map(EF_LAND, atoi(player->argp[1]), &ns, &origin);
-           draw_map(bmap_flag, origin, 0, &ns);
+           do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]);
            skip = 1;
            break;
        case 'f':

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index a20e403956b6e69c9633861c3b8936fe6f08a4a4..f74b30c914aefc081dc4e6f17f4e08a4ec723d63 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -52,8 +52,6 @@ navi(void)
     int together;
     char *cp = NULL;
     struct shpstr *shp = NULL; /* flagship */
-    struct nstr_sect ns;
-    char origin;
     int dir;
     int stopping = 0;
     int skip = 0;
@@ -164,8 +162,7 @@ navi(void)
             * fall through
             */
        case 'M':
-           unit_map(EF_SHIP, atoi(player->argp[1]), &ns, &origin);
-           draw_map(bmap_flag, origin, MAP_SHIP, &ns);
+           do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]);
            skip = 1;
            break;
        case 'f':