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

Clean up bmap commands' flags argument

Browse source 
parse_map_flags() silently truncates map flags after the first 't' or
'r'.  This makes it accept arguments "true" and "revert".  However, it
also breaks the perfectly sensible argument "ts", which should show
ships just like "st", but doesn't.

info bmap & friends document arguments "true" and "revert", and also
suggest flags 't' and 'r'.  What a mess.

Make argument "revert" a special case.  Deprecate flag 'r', and clean
up truncation there.

Don't truncate after flag 't'.  If any bad flags follow, ignore
everything after 't', but deprecate that usage.
This commit is contained in:
Markus Armbruster 2011-04-10 07:43:04 +02:00
parent 457f797972
commit a00f9e200e
7 changed files with 64 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/lib/subs/maps.c
View file

@ -41,6 +41,7 @@
#include "file.h"
#include "land.h"
#include "map.h"
#include "match.h"
#include "misc.h"
#include "nat.h"
#include "nsc.h"
@ -104,11 +105,21 @@ do_map(int bmap, int unit_type, char *arg, char *map_flags_arg)
return draw_map(origin, map_flags, &ns);
}
static void
warn_deprecated_arg(char *what, char *arg, char *use)
{
pr("%s '%s' is deprecated and will go away in a future release.\n"
"Use %s instead.\n",
what, arg, use);
}
static int
parse_map_flags(int bmap, char *str)
{
int map_flags;
char *p;
int tflags = 0;
char *tp = NULL;
switch (bmap) {
default: CANT_REACH();
@ -121,6 +132,10 @@ parse_map_flags(int bmap, char *str)
if (!str)
return map_flags;
/* special case "revert" */
if (bmap == 'b' && mineq(str, "revert") != ME_MISMATCH)
return MAP_BMAP_REVERT;
for (p = str; *p; p++) {
switch (*p) {
case 's':
@ -149,13 +164,29 @@ parse_map_flags(int bmap, char *str)
case 't':
if (bmap != 'b')
goto bad_flag;
return map_flags | MAP_ALT;
map_flags |= MAP_ALT;
/*
* Flags following 't' used to be ignored. That breaks
* perfectly sensible "ts". Try to continue, but save
* state for when a bad flag is found.
*/
if (!tflags) {
tflags = map_flags;
tp = p;
}
break;
case 'r':
if (bmap != 'b')
if (bmap != 'b' || tflags)
goto bad_flag;
warn_deprecated_arg("Map flag", "r", "argument 'revert'");
return MAP_BMAP_REVERT;
default:
bad_flag:
if (tflags) {
/* ignore bad flags following 't' */
warn_deprecated_arg("Argument", tp, "map flag 't'");
return tflags;
}
pr("Bad flag %c!\n", *p);
return -1;
}