Revert "(prmptrd, uprmptrd): Should not be called while player->aborted. Check."
This reverts commit fee8ac9d8f
.
These *are* called while player->aborted. Could be avoided, but: the
reason for not wanting to prompt then is to have each prompt consume a
line of input. That's actually not feasible, because when we wait for
an argument (after prompting for it) when the update aborts commands,
we can't consume the argument we prompted for.
This commit is contained in:
parent
61998d2316
commit
c66e8319ee
1 changed files with 0 additions and 9 deletions
|
@ -368,12 +368,6 @@ prmptrd(char *prompt, char *buf, int size)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/*
|
|
||||||
* Each prompt must consume one line of input. recvclient()
|
|
||||||
* doesn't do that while player->aborted.
|
|
||||||
*/
|
|
||||||
CANT_HAPPEN(player->aborted);
|
|
||||||
|
|
||||||
if (CANT_HAPPEN(!prompt))
|
if (CANT_HAPPEN(!prompt))
|
||||||
prompt = "? ";
|
prompt = "? ";
|
||||||
|
|
||||||
|
@ -403,9 +397,6 @@ uprmptrd(char *prompt, char *buf, int size)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* See prmptrd() */
|
|
||||||
CANT_HAPPEN(player->aborted);
|
|
||||||
|
|
||||||
if (CANT_HAPPEN(!prompt))
|
if (CANT_HAPPEN(!prompt))
|
||||||
prompt = "? ";
|
prompt = "? ";
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue