Allow for the bathing goddess in ravage(). From OpenBSD.

[bsdgames-darwin.git] / battlestar / com3.c

diff --git a/battlestar/com3.c b/battlestar/com3.c
index d508d5e25b1a23c9956e8a812daff0a09dcdd246..ea6d122b33e2b7f0cf113f1875fe1a98b75aa966 100644 (file)
--- a/battlestar/com3.c
+++ b/battlestar/com3.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: com3.c,v 1.7 1998/08/24 00:19:25 hubertf Exp $ */
+/*     $NetBSD: com3.c,v 1.10 2000/09/23 19:23:58 jsm Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com3.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com3.c,v 1.7 1998/08/24 00:19:25 hubertf Exp $");
+__RCSID("$NetBSD: com3.c,v 1.10 2000/09/23 19:23:58 jsm Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -194,21 +194,20 @@ int
 shoot()
 {
        int     firstnumber, value;
-       int     n;
 
        firstnumber = wordnumber;
        if (!testbit(inven, LASER))
                puts("You aren't holding a blaster.");
        else {
-               while (wordtype[++wordnumber] == ADJS);
+               wordnumber++;
                while (wordnumber <= wordcount && wordtype[wordnumber] == OBJECT) {
                        value = wordvalue[wordnumber];
                        printf("%s:\n", objsht[value]);
-                       for (n = 0; objsht[value][n]; n++);
                        if (testbit(location[position].objects, value)) {
                                clearbit(location[position].objects, value);
                                ourtime++;
-                               printf("The %s explode%s\n", objsht[value], (objsht[value][n - 1] == 's' ? (objsht[value][n - 2] == 's' ? "s." : ".") : "s."));
+                               printf("The %s explode%s\n", objsht[value],
+                                   (is_plural_object(value) ? "." : "s."));
                                if (value == BOMB)
                                        die();
                        } else
@@ -286,7 +285,7 @@ shoot()
                                        clearbit(location[position].objects, TIMER);
                                        setbit(location[position].objects, DEADTIME);
                                } else
-                                       puts("What old timer?");
+                                       puts("What old-timer?");
                                break;
                        case MAN:
                                if (testbit(location[position].objects, MAN)) {