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

11
src/lib/commands/shut.c
View file

@ -50,10 +50,15 @@ shut(void)
shutdown_minutes =
onearg(player->argp[1],
"Time until shutdown in minutes (-1 to abort shutdown sequence)? ");
if (!updates_disabled())
if (!(p = getstarg(player->argp[2], "Disable update [y]? ", buf))
|| *p != 'n')
if (player->aborted)
return RET_SYN;
if (!updates_disabled()) {
p = getstarg(player->argp[2], "Disable update [y]? ", buf);
if (!p)
return RET_SYN;
if (*p != 'n')
disa();
}
shutdown_was_pending = shutdown_initiate(shutdown_minutes);
if (shutdown_was_pending < 0)