From c66e8319ee075c376382cedcba0eeae7e7334885 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 28 Apr 2008 22:22:18 +0200 Subject: [PATCH] Revert "(prmptrd, uprmptrd): Should not be called while player->aborted. Check." This reverts commit fee8ac9d8f519649ad72129cae9ffb3bbd5d7ffb. 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. --- src/lib/subs/pr.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index 6f2be24a..711dd3f4 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -368,12 +368,6 @@ prmptrd(char *prompt, char *buf, int size) { 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)) prompt = "? "; @@ -403,9 +397,6 @@ uprmptrd(char *prompt, char *buf, int size) { int r; - /* See prmptrd() */ - CANT_HAPPEN(player->aborted); - if (CANT_HAPPEN(!prompt)) prompt = "? ";