-/* $NetBSD: com5.c,v 1.7 1998/08/28 00:44:31 hubertf Exp $ */
+/* $NetBSD: com5.c,v 1.11 2000/09/08 17:25:31 jsm Exp $ */
/*
* Copyright (c) 1983, 1993
#if 0
static char sccsid[] = "@(#)com5.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: com5.c,v 1.7 1998/08/28 00:44:31 hubertf Exp $");
+__RCSID("$NetBSD: com5.c,v 1.11 2000/09/08 17:25:31 jsm Exp $");
#endif
#endif /* not lint */
puts("She is coming around; she didn't fight it as much.");
break;
case 2:
- puts("She's begining to like it.");
+ puts("She's beginning to like it.");
break;
default:
puts("She's gone limp.");
while (wordtype[++wordnumber] != NOUNS && wordnumber <= wordcount);
if (wordtype[wordnumber] == NOUNS && testbit(location[position].objects, wordvalue[wordnumber])) {
- if (wordvalue[wordnumber] == NORMGOD && !loved)
+ if (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("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.");
power++;
pleasure += 15;
puts("You wish!");
return;
}
+ }
if (wordvalue[wordnumber] == NATIVE) {
- puts("The girl is easy prey. She peals off her sarong and indulges you.");
+ puts("The girl is easy prey. She peels off her sarong and indulges you.");
power++;
pleasure += 5;
printf("Girl:\n");
person = wordvalue[wordnumber];
last2 = wordnumber;
}
- if (last1 == 0) {
- puts("You didn't say what to give.");
- return (0);
- }
+ /* Setting wordnumber to last1 - 1 looks wrong if last1 is 0, e.g.,
+ * plain `give'. However, detecting this case is liable to detect
+ * `give foo' as well, which would give a confusing error. We
+ * need to make sure the -1 value can cause no problems if it arises.
+ * If in the below we get to the drop("Given") then drop will look
+ * at word 0 for an object to give, and fail, which is OK; then
+ * result will be -1 and we get to the end, where wordnumber gets
+ * set to something more sensible. If we get to "I don't think
+ * that is possible" then again wordnumber is set to something
+ * sensible. The wordnumber we leave with still isn't right if
+ * you include words the game doesn't know in your command, but
+ * that's no worse than what other commands than give do in
+ * the same place. */
wordnumber = last1 - 1;
if (person && testbit(location[position].objects, person))
if (person == NORMGOD && godready < 2 && !(obj == RING || obj == BRACELET))
result = drop("Given");
else {
puts("I don't think that is possible.");
+ wordnumber = max(last1, last2) + 1;
return (0);
}
if (result != -1 && (testbit(location[position].objects, obj) || obj == AMULET || obj == MEDALION || obj == TALISMAN)) {
power -= 5;
if (win >= 3) {
puts("The powers of the earth are now legitimate. You have destroyed the Darkness");
- puts("and restored the goddess to her thrown. The entire island celebrates with");
+ puts("and restored the goddess to her throne. The entire island celebrates with");
puts("dancing and spring feasts. As a measure of her gratitude, the goddess weds you");
puts("in the late summer and crowns you Prince Liverwort, Lord of Fungus.");
puts("\nBut, as the year wears on and autumn comes along, you become restless and");
puts("yearn for adventure. The goddess, too, realizes that the marriage can't last.");
puts("She becomes bored and takes several more natives as husbands. One evening,");
- puts("after having been out drinking with the girls, she kicks the throne particulary");
+ puts("after having been out drinking with the girls, she kicks the throne particularly");
puts("hard and wakes you up. (If you want to win this game, you're going to have to\nshoot her!)");
clearbit(location[position].objects, MEDALION);
wintime = ourtime;
break;
}
}
- wordnumber = max(last1, last2);
+ wordnumber = max(last1, last2) + 1;
return (firstnumber);
}
git.ckatri.com / bsdgames-darwin.git / blobdiff