Use defined constant FINAL instead of hardcoded 275. From OpenBSD.

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

diff --git a/battlestar/com5.c b/battlestar/com5.c
index b8f32a799db17ed1e05d584bd34d1c9aacdfb6c6..3c2f791afa3696b9256619c6abe38aa2db69a685 100644 (file)
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: com5.c,v 1.14 2000/09/21 09:48:10 jsm Exp $    */
+/*     $NetBSD: com5.c,v 1.16 2000/09/24 14:20:23 jsm Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com5.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com5.c,v 1.14 2000/09/21 09:48:10 jsm Exp $");
+__RCSID("$NetBSD: com5.c,v 1.16 2000/09/24 14:20:23 jsm Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -47,7 +47,8 @@ __RCSID("$NetBSD: com5.c,v 1.14 2000/09/21 09:48:10 jsm Exp $");
 void
 kiss()
 {
-       while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount);
+       while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount)
+               continue;
        /* The goddess must be "taken" first if bathing. */
        if (wordtype[wordnumber] == NOUNS && wordvalue[wordnumber] == NORMGOD
            && testbit(location[position].objects, BATHGOD)) {
@@ -99,9 +100,12 @@ love()
 {
        int     n;
 
-       while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount);
-       if (wordtype[wordnumber] == NOUNS && testbit(location[position].objects, wordvalue[wordnumber])) {
-               if (wordvalue[wordnumber] == NORMGOD && !loved) {
+       while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount)
+               continue;
+       if (wordtype[wordnumber] == NOUNS) {
+               if ((testbit(location[position].objects, BATHGOD) ||
+                   testbit(location[position].objects, NORMGOD)) &&
+                   wordvalue[wordnumber] == NORMGOD && !loved) {
                        if (godready >= 2) {
                                puts("She cuddles up to you, and her mouth starts to work:\n'That was my sister's amulet.  The lovely goddess, Purl, was she.  The Empire\ncaptured her just after the Darkness came.  My other sister, Vert, was killed\nby the Dark Lord himself.  He took her amulet and warped its power.\nYour quest was foretold by my father before he died, but to get the Dark Lord's\namulet you must use cunning and skill.  I will leave you my amulet,");
                                puts("which you may use as you wish.  As for me, I am the last goddess of the\nwaters.  My father was the Island King, and the rule is rightfully mine.'\n\nShe pulls the throne out into a large bed.");
@@ -120,21 +124,30 @@ love()
                                        setbit(location[position].objects, MEDALION);
                                loved = 1;
                                ourtime += 10;
+                               printf("Loved.\n");
                                zzz();
                        } else {
                                puts("You wish!");
                                return;
                        }
                }
-               if (wordvalue[wordnumber] == NATIVE) {
-                       puts("The girl is easy prey.  She peels off her sarong and indulges you.");
-                       power++;
-                       pleasure += 5;
-                       printf("Girl:\n");
-                       ourtime += 10;
-                       zzz();
-               }
-               printf("Loved.\n");
+               if (testbit(location[position].objects, wordvalue[wordnumber])) {
+                       if (wordvalue[wordnumber] == NATIVE) {
+                               puts("The girl is easy prey.  She peels off her sarong and indulges you.");
+                               power++;
+                               pleasure += 5;
+                               printf("Girl:\n");
+                               ourtime += 10;
+                               printf("Loved.\n");
+                               zzz();
+                       }
+                       if (wordvalue[wordnumber] == MAN ||
+                           wordvalue[wordnumber] == BODY ||
+                           wordvalue[wordnumber] == ELF ||
+                           wordvalue[wordnumber] == TIMER)
+                               puts("Kinky!");
+               } else
+                       puts("Where's your lover?");
        } else
                puts("It doesn't seem to work.");
 }
@@ -255,7 +268,8 @@ give()
 
        last1 = last2 = 0;
        firstnumber = wordnumber;
-       while (wordtype[++wordnumber] != OBJECT && wordvalue[wordnumber] != AMULET && wordvalue[wordnumber] != MEDALION && wordvalue[wordnumber] != TALISMAN && wordnumber <= wordcount);
+       while (wordtype[++wordnumber] != OBJECT && wordvalue[wordnumber] != AMULET && wordvalue[wordnumber] != MEDALION && wordvalue[wordnumber] != TALISMAN && wordnumber <= wordcount)
+               continue;
        if (wordnumber <= wordcount) {
                obj = wordvalue[wordnumber];
                if (obj == EVERYTHING)