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

Make retr() and lretr() simpler and more robust

Browse source 
The old code recognized group retreat only when the first argument was
on the command line.  Didn't make a difference, because it was only
used when there were at least two arguments on the command line.

The old code relied on rflags being represented as two's complement.

When given an empty retreat path, the old code deleted the retreat
path and set the retreat flags normally.  The new code deletes both.
Neither is nice; it should perhaps keep the retreat path and only set
the flags.
This commit is contained in:
Markus Armbruster 2008-07-04 23:47:55 -04:00
parent 67a9a8d96a
commit 44e2ef468f
1 changed files with 20 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/lib/commands/retr.c
View file

@ -48,9 +48,7 @@ retr(void)
int nships; int nships;
struct nstr_item ni; struct nstr_item ni;
struct shpstr ship; struct shpstr ship;
int isfleet = 0; int rflags;
int rflags = -2;
int zero;
unsigned i; unsigned i;
char buf1[1024]; char buf1[1024];
char buf2[1024]; char buf2[1024];
@ -58,22 +56,19 @@ retr(void)
if (!snxtitem(&ni, EF_SHIP, player->argp[1])) if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
return RET_SYN; return RET_SYN;
nships = 0; nships = 0;
if (player->argp[1] != NULL)
if (isalpha(player->argp[1][0]))
isfleet = RET_GROUP;
if (player->argp[2] != NULL) if (player->argp[2] != NULL)
pq = getstarg(player->argp[2], "Retreat path? ", buf1); pq = getstarg(player->argp[2], "Retreat path? ", buf1);
else else
pq = NULL; pq = NULL;
rflags = 0;
if (pq != NULL) { if (pq != NULL) {
fl = getstarg(player->argp[3], fl = getstarg(player->argp[3],
"Retreat conditions [i|t|s|h|b|d|u|c]? ", buf2); "Retreat conditions [i|t|s|h|b|d|u|c]? ", buf2);
if (!fl) if (!fl)
return RET_SYN; return RET_SYN;
rflags = 0 | isfleet;
for (i = 0; i < strlen(fl); i++) { for (i = 0; fl[i]; i++) {
switch (fl[i]) { switch (fl[i]) {
case 'I': case 'I':
case 'i': case 'i':
@ -105,7 +100,7 @@ retr(void)
break; break;
case 'C': case 'C':
case 'c': case 'c':
rflags = -1; pq = "";
break; break;
default: default:
pr("bad condition\n"); pr("bad condition\n");
@ -120,30 +115,21 @@ retr(void)
pr("u\tretreat when boarded\n"); pr("u\tretreat when boarded\n");
} }
} }
if (rflags == isfleet) { if (*pq && !rflags) {
pr("Must give retreat conditions!\n"); pr("Must give retreat conditions!\n");
return RET_FAIL; return RET_FAIL;
} }
} if (ni.sel == NS_GROUP && ni.group)
rflags |= RET_GROUP;
if (rflags == -1) if (!*pq)
pq = NULL;
zero = (rflags == -1);
if (zero)
rflags = 0; rflags = 0;
}
while (nxtitem(&ni, &ship)) { while (nxtitem(&ni, &ship)) {
if (!player->owner || ship.shp_own == 0) if (!player->owner || ship.shp_own == 0)
continue; continue;
if (zero)
memset(ship.shp_rpath, 0, sizeof(ship.shp_rpath));
if (pq != NULL) { if (pq != NULL) {
strncpy(ship.shp_rpath, pq, sizeof(ship.shp_rpath) - 1); strncpy(ship.shp_rpath, pq, sizeof(ship.shp_rpath) - 1);
putship(ship.shp_uid, &ship);
}
if (rflags >= 0) {
ship.shp_rflags = rflags; ship.shp_rflags = rflags;
putship(ship.shp_uid, &ship); putship(ship.shp_uid, &ship);
} }
@ -197,31 +183,27 @@ lretr(void)
int nunits; int nunits;
struct nstr_item ni; struct nstr_item ni;
struct lndstr land; struct lndstr land;
int isarmy = 0; int rflags;
int rflags = -2; unsigned i;
int zero;
char buf1[1024]; char buf1[1024];
char buf2[1024]; char buf2[1024];
unsigned i;
if (!snxtitem(&ni, EF_LAND, player->argp[1])) if (!snxtitem(&ni, EF_LAND, player->argp[1]))
return RET_SYN; return RET_SYN;
nunits = 0; nunits = 0;
if (player->argp[1] != NULL)
if (isalpha(player->argp[1][0]))
isarmy = RET_GROUP;
if (player->argp[2] != NULL) if (player->argp[2] != NULL)
pq = getstarg(player->argp[2], "Retreat path? ", buf1); pq = getstarg(player->argp[2], "Retreat path? ", buf1);
else else
pq = NULL; pq = NULL;
rflags = 0;
if (pq != NULL) { if (pq != NULL) {
fl = getstarg(player->argp[3], "Retreat conditions [i|h|b|c]? ", fl = getstarg(player->argp[3], "Retreat conditions [i|h|b|c]? ",
buf2); buf2);
if (!fl) if (!fl)
return RET_SYN; return RET_SYN;
rflags = 0 | isarmy;
for (i = 0; i < strlen(fl); i++) { for (i = 0; fl[i]; i++) {
switch (fl[i]) { switch (fl[i]) {
case 'I': case 'I':
case 'i': case 'i':
@ -237,7 +219,7 @@ lretr(void)
break; break;
case 'C': case 'C':
case 'c': case 'c':
rflags = -1; pq = "";
break; break;
default: default:
pr("bad condition\n"); pr("bad condition\n");
@ -248,30 +230,21 @@ lretr(void)
pr("b\tretreat when bombed\n"); pr("b\tretreat when bombed\n");
} }
} }
if (rflags == isarmy) { if (*pq && !rflags) {
pr("Must give retreat conditions!\n"); pr("Must give retreat conditions!\n");
return RET_FAIL; return RET_FAIL;
} }
} if (ni.sel == NS_GROUP && ni.group)
rflags |= RET_GROUP;
if (rflags == -1) if (!*pq)
pq = NULL;
zero = (rflags == -1);
if (zero)
rflags = 0; rflags = 0;
}
while (nxtitem(&ni, &land)) { while (nxtitem(&ni, &land)) {
if (!player->owner || land.lnd_own == 0) if (!player->owner || land.lnd_own == 0)
continue; continue;
if (zero)
memset(land.lnd_rpath, 0, sizeof(land.lnd_rpath));
if (pq != NULL) { if (pq != NULL) {
strncpy(land.lnd_rpath, pq, sizeof(land.lnd_rpath) - 1); strncpy(land.lnd_rpath, pq, sizeof(land.lnd_rpath) - 1);
putland(land.lnd_uid, &land);
}
if (rflags >= 0) {
land.lnd_rflags = rflags; land.lnd_rflags = rflags;
putland(land.lnd_uid, &land); putland(land.lnd_uid, &land);
} }