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

(marc, navi): Permit any whitespace between route and optional

Browse source 
argument for radar, lookout, sonar, not just spaces.
This commit is contained in:
Markus Armbruster 2006-03-23 19:50:25 +00:00
parent aebcc536e4
commit bddb20c7f0
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/commands/marc.c
View file

@ -80,7 +80,7 @@ march(void)
} }
while (!QEMPTY(&land_list)) { while (!QEMPTY(&land_list)) {
s_char *bp, dp[80]; char *bp, dp[80];
if (cp == 0 || *cp == '\0' || stopping) { if (cp == 0 || *cp == '\0' || stopping) {
stopping = 0; stopping = 0;
@ -140,18 +140,15 @@ march(void)
} }
continue; continue;
} else if (*cp == 'r' || *cp == 'l') { } else if (*cp == 'r' || *cp == 'l') {
bp = ++cp; for (bp = cp + 1; *bp && !isspace(bp); bp++) ;
while ((*bp != ' ') && (*bp)) for (; *bp && isspace(bp); bp++) ;
bp++; if (*bp)
while ((*bp == ' ') && (*bp))
bp++;
if ((bp != (s_char *)0) && (*bp))
player->argp[1] = bp; player->argp[1] = bp;
else { else {
sprintf(dp, "%d", lnd->lnd_uid); sprintf(dp, "%d", lnd->lnd_uid);
player->argp[1] = dp; player->argp[1] = dp;
} }
if (cp[-1] == 'r') { if (*cp++ == 'r') {
player->argp[0] = "lradar"; player->argp[0] = "lradar";
rada(); rada();
skip = 1; skip = 1;

13
src/lib/commands/navi.c
View file

@ -86,7 +86,7 @@ navi(void)
*pt = '\0'; *pt = '\0';
while (!QEMPTY(&ship_list)) { while (!QEMPTY(&ship_list)) {
s_char *bp, dp[80]; char *bp, dp[80];
if (cp == 0 || *cp == '\0' || stopping) { if (cp == 0 || *cp == '\0' || stopping) {
stopping = 0; stopping = 0;
@ -161,18 +161,15 @@ navi(void)
} }
continue; continue;
} else if (*cp == 'r' || *cp == 'l' || *cp == 's') { } else if (*cp == 'r' || *cp == 'l' || *cp == 's') {
bp = ++cp; for (bp = cp + 1; *bp && !isspace(*bp); bp++) ;
while ((*bp != ' ') && (*bp)) for (; *bp && isspace(*bp); bp++) ;
bp++; if (*bp)
while ((*bp == ' ') && (*bp))
bp++;
if ((bp != (s_char *)0) && (*bp))
player->argp[1] = bp; player->argp[1] = bp;
else { else {
sprintf(dp, "%d", shp->shp_uid); sprintf(dp, "%d", shp->shp_uid);
player->argp[1] = dp; player->argp[1] = dp;
} }
if (cp[-1] == 'r') { if (*cp++ == 'r') {
rada(); rada();
skip = 1; skip = 1;
} else if (cp[-1] == 'l') } else if (cp[-1] == 'l')