From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 11 Feb 2012 08:51:46 +0000 (+0100)
Subject: Fix 'm' in path argument of explore, move, transport
X-Git-Tag: v4.3.30~55
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=330f8ca567bcb12b852a19709ae1b6d82819ad46

Fix 'm' in path argument of explore, move, transport

Two related bugs:

* It moans about deprecated argument syntax ('m' without a space
  before its argument) even when there's no argument.

* It uses the third instead of second argument for map flags (second
  argument is ignored): "m# s" doesn't show ships, and "m# s p" shows
  planes instead of ships.

Broken in commit 28d48474, v4.3.27.
---

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index 748548edb..0d7de92ac 100644
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -64,7 +64,6 @@ move_ground(struct sctstr *start, struct sctstr *end,
     int dir;
     char scanspace[1024];
     char *argp[128];
-    int ac;
     int intcost;
     int takedam = *dam;
     int out = 0;
@@ -172,11 +171,12 @@ move_ground(struct sctstr *start, struct sctstr *end,
 	    continue;
 	}
 	if (dir == DIR_MAP) {
-	    ac = parse(movstr, scanspace, argp, NULL, NULL, NULL);
-	    if (ac == 1) {
+	    parse(movstr, scanspace, argp, NULL, NULL, NULL);
+	    if (argp[0][1]) {
 		pr("Use of '%c' without a space before its argument is deprecated.\n"
 		   "Support for it will go away in a future release\n",
 		   *movstr);
+		argp[2] = argp[1];
 		argp[1] = argp[0] + 1;
 	    }
 	    if (!exploring)