empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Markus Armbruster 2012-02-11 09:51:46 +01:00
parent 9f3e9f833a
commit 330f8ca567
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/subs/move.c
View file

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