From f3fb9c3c4e577da63c8edcdcf61db35afba19223 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 19 Nov 2005 11:27:03 +0000 Subject: [PATCH] (cons_choose): When an argument is bad, do not loop prompting, just fail. That's what the vast majority of commands do. --- src/lib/commands/cons.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c index f1999536..c81714ce 100644 --- a/src/lib/commands/cons.c +++ b/src/lib/commands/cons.c @@ -174,14 +174,8 @@ cons_choose(struct ltcomstr *ltcp) } ltcp->mailee = (ltcp->proposer == player->cnum) ? ltcp->proposee : ltcp->proposer; - while ((p = - getstarg(player->argp[3], "Accept, decline or postpone? ", - buf)) && *p) { - if (*p == 'a' || *p == 'd' || *p == 'p') - break; - player->argp[3] = 0; - } - if (p == 0 || *p == 0) + p = getstarg(player->argp[3], "Accept, decline or postpone? ", buf); + if (!p || (*p != 'a' && *p != 'd' && *p != 'p')) return RET_SYN; ltcp->op = *p; return RET_OK;