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

Fix command abortion after getting player input

Browse source 
The old code didn't honor command abortion at the following prompts:

* arm third argument

* deliver fourth argument (also simplify)

* fire third argument

* fly and recon prompt for carrier to land on: pln_onewaymission()
  treated abort like empty input, which made planes attempt landing in
  the sector.

* lmine second argument

* order d fourth argument

* power c nat(s) argument

* range second argument

* sail second argument

* shutdown both arguments (first one was broken in commit 84cfd670,
  v4.3.10, second one never worked).

* tend third argument
This commit is contained in:
Markus Armbruster 2008-07-15 07:55:42 -04:00
parent b3a7a8ee11
commit 9eda5f87b8
11 changed files with 51 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/commands/tend.c
View file

@ -90,7 +90,10 @@ tend(void)
if (type == EF_LAND) {
sprintf(prompt, "Land unit(s) to tend from %s? ",
prship(&tender));
if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
p = getstarg(player->argp[3], prompt, buf);
if (!p)
return RET_SYN;
if (!*p)
continue;
if (!check_ship_ok(&tender))
return RET_SYN;
@ -100,7 +103,10 @@ tend(void)
}
sprintf(prompt, "Number of %s to tend from %s? ",
ip->i_name, prship(&tender));
if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
p = getstarg(player->argp[3], prompt, buf);
if (!p)
return RET_SYN;
if (!*p)
continue;
if (!check_ship_ok(&tender))
return RET_SYN;