From: Eric S. Raymond <esr@thyrsus.com>
Date: Wed, 21 Jun 2017 21:23:28 +0000 (-0400)
Subject: Simple fix for GitLab issue #14: Behaviour of magic words changed
X-Git-Tag: 1.1~166
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=inline;h=433e787de85c5833003790fd596d1ac2183c9eb7;p=open-adventure.git

Simple fix for GitLab issue #14: Behaviour of magic words changed

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.
---

diff --git a/actions.c b/actions.c
index 6279306..45dd8b6 100644
--- 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 {