From 3c25ebd9275a2f09121189dd5e998c26b637f490 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 19 Jul 2008 17:26:54 -0400
Subject: [PATCH] Simplify att_prompt()

---
 src/lib/subs/attsub.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index b874682b..64ce6196 100644
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -951,11 +951,11 @@ att_prompt(char *prompt, char army)
 	army = '~';
     for (;;) {
 	p = getstring(prompt, buf);
-	if (player->aborted || (p && *p == 'q')) {
+	if (!p || *p == 'q') {
 	    abort_attack();
 	    return 'N';
 	}
-	if (!p || !*p)
+	if (!*p)
 	    return 'n';
 	if (tolower(*p) == 'y' || tolower(*p) == 'n')
 	    return *p;