From 8e7199c3383cd6526e539fdee1ff61cc468ce594 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Thu, 20 Jul 2006 13:33:11 +0000
Subject: [PATCH] (march, navi): Provide equivalent functionality to map in
 move(), expl() and tran(). Allow map and bmap to access the regular map
 command parameters.

---
 info/march.t            | 8 ++++----
 info/navigate.t         | 8 ++++----
 src/lib/commands/marc.c | 5 +----
 src/lib/commands/navi.c | 5 +----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/info/march.t b/info/march.t
index cc0115a3..46b98c7b 100644
--- 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 85e9d39c..54e5b2a7 100644
--- 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 b6293e34..87f6cb62 100644
--- 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 a20e4039..f74b30c9 100644
--- 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':