archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nothing but FOO can start a magic-word sequence,

Browse source 
100% coverage ans oldcompare passes.
This commit is contained in:
Eric S. Raymond 2023-04-03 06:10:12 -04:00
parent 20cb8b9ffb
commit 0a1f5dbb43
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
actions.c
View file

@ -194,6 +194,11 @@ static phase_codes_t bigwords(vocab_t id)
{ {
int foobar = abs(game.foobar); int foobar = abs(game.foobar);
if ((foobar == WORD_EMPTY) && (id == FIE || id == FOE || id == FOO || id == FUM)) {
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
}
if ((foobar == WORD_EMPTY && id == FEE) || if ((foobar == WORD_EMPTY && id == FEE) ||
(foobar == FEE && id == FIE) || (foobar == FEE && id == FIE) ||
(foobar == FIE && id == FOE) || (foobar == FIE && id == FOE) ||

10
tests/magicwords.chk
View file

@ -13,6 +13,14 @@ Seed set to 1838473132
You're in front of building. You're in front of building.
> foo
Nothing happens.
> say foo
Nothing happens.
> in > in
You are inside a building, a well house for a large spring. You are inside a building, a well house for a large spring.
@ -1863,7 +1871,7 @@ OK
What's the matter, can't you read? Now you'd best start over. What's the matter, can't you read? Now you'd best start over.
> >
You scored 253 out of a possible 430, using 313 turns. You scored 253 out of a possible 430, using 315 turns.
You have reached "Junior Master" status. You have reached "Junior Master" status.

6
tests/magicwords.log
View file

@ -33,8 +33,8 @@
n n
seed 1838473132 seed 1838473132
# Test isolated 'foo' word # Test isolated 'foo' word
#foo foo
#say foo say foo
in in
# Say bigwords ending with foo when not in Giant's Room # Say bigwords ending with foo when not in Giant's Room
say fee say fee
@ -48,7 +48,7 @@ say fie
say foe say foe
#say fum #say fum
z z
#find foo find foo
z z
take lamp take lamp
xyzzy xyzzy