Simple fix for GitLab issue #14: Behaviour of magic words changed
authorEric S. Raymond <esr@thyrsus.com>
Wed, 21 Jun 2017 21:23:28 +0000 (17:23 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 21 Jun 2017 21:23:28 +0000 (17:23 -0400)
Say "Nothing happens" on "foo" not in Giant Room, rather than "What's
the matter, can't you read?  Now you'd best start over." which only
makes sense there.

It would be funnier to say something like "Well, that was remarkably
pointless." Maybe later.

actions.c

index 6279306f723d801e20e5f494f8a27e8ace83f292..45dd8b66fe11ed0ac1bdec3a93690a9d727846d0 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -112,7 +112,7 @@ static int bigwords(token_t foo)
     int k = VOCAB(foo, 3);
     int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
-        if (game.foobar != 0)spk = START_OVER;
+        if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
         rspeak(spk);
         return GO_CLEAROBJ;
     } else {