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

Fail commands properly when they get aborted

Browse source 
The old code didn't return RET_SYN when aborting at the following
prompts:

* designate second argument

* morale second argument

* route second argument

* set third argument

* tend fourth argument

* zdone last argument
This commit is contained in:
Markus Armbruster 2008-07-19 10:00:23 -04:00
parent a7cf69af50
commit be41e70fa8
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/commands/mora.c
View file

@ -50,7 +50,7 @@ morale(void)
if (!snxtitem(&np, EF_LAND, player->argp[1]))
return RET_SYN;
while (!player->aborted && nxtitem(&np, &land)) {
while (nxtitem(&np, &land)) {
if (!player->owner || land.lnd_own == 0)
continue;
natp = getnatp(land.lnd_own);
@ -58,11 +58,11 @@ morale(void)
sprintf(mess, "New retreat percentage for %s (min %d%%)? ",
prland(&land), min);
p = getstarg(player->argp[2], mess, buf);
if (!p)
return RET_SYN;
if (!check_land_ok(&land))
continue;
if (player->aborted)
continue;
if (!p || (i = atoi(p)) < 0)
if ((i = atoi(p)) < 0)
continue;
land.lnd_retreat = ((i < min) ? min : i);
if (land.lnd_retreat > 100)