Fix loving already loved goddess; avoid fallthrough after loving

goddess; give error on "love amulet".  From OpenBSD.

1 files changed, 10 insertions, 3 deletions

diff --git a/battlestar/com5.c b/battlestar/com5.c
index 3c2f791a..7f263db4 100644
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com5.c,v 1.16 2000/09/24 14:20:23 jsm Exp $	*/
+/*	$NetBSD: com5.c,v 1.17 2000/09/25 14:05:52 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.16 2000/09/24 14:20:23 jsm Exp $");
+__RCSID("$NetBSD: com5.c,v 1.17 2000/09/25 14:05:52 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -105,7 +105,11 @@ love()
 	if (wordtype[wordnumber] == NOUNS) {
 		if ((testbit(location[position].objects, BATHGOD) ||
 		    testbit(location[position].objects, NORMGOD)) &&
-		    wordvalue[wordnumber] == NORMGOD && !loved) {
+		    wordvalue[wordnumber] == NORMGOD) {
+			if (loved) {
+				printf("Loved.\n");
+				return;
+			}
 			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.");
@@ -126,6 +130,7 @@ love()
 				ourtime += 10;
 				printf("Loved.\n");
 				zzz();
+				return;
 			} else {
 				puts("You wish!");
 				return;
@@ -146,6 +151,8 @@ love()
 			    wordvalue[wordnumber] == ELF ||
 			    wordvalue[wordnumber] == TIMER)
 				puts("Kinky!");
+			else
+				puts("It doesn't seem to work.");
 		} else
 			puts("Where's your lover?");
 	} else