]> git.pond.sub.org Git - empserver/commitdiff
(cons_choose): When an argument is bad, do not loop prompting, just
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 19 Nov 2005 11:27:03 +0000 (11:27 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Sat, 19 Nov 2005 11:27:03 +0000 (11:27 +0000)
fail.  That's what the vast majority of commands do.

src/lib/commands/cons.c

index f1999536c6020ff42200114b4b85d17c1a7c79b6..c81714ce7edf9b6c386f8586613b56ac64b4d67a 100644 (file)
@@ -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;