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

Second part of fix for "fee fie foe foo" and "fum", with test.

Browse source
This commit is contained in:
Eric S. Raymond 2022-04-06 14:00:34 -04:00
parent db384731a7
commit dd5ca23302
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
actions.c
View file

@ -187,9 +187,10 @@ static phase_codes_t attack(command_t command)
} }
static phase_codes_t bigwords(vocab_t id) static phase_codes_t bigwords(vocab_t id)
/* FEE FIE FOE FOO (AND FUM). Advance to next state if given in proper order. /* Only called on FEE FIE FOE FOO (AND FUM). Advance to next state if given
* Look up foo in special section of vocab to determine which word we've got. * in proper order. Look up foo in special section of vocab to determine which
* Last word zips the eggs back to the giant room (unless already there). */ * word we've got. Last word zips the eggs back to the giant room (unless
* already there). */
{ {
if ((game.foobar == WORD_EMPTY && id == FEE) || if ((game.foobar == WORD_EMPTY && id == FEE) ||
(game.foobar == FEE && id == FIE) || (game.foobar == FEE && id == FIE) ||
@ -228,9 +229,9 @@ static phase_codes_t bigwords(vocab_t id)
if (game.loc == LOC_GIANTROOM) { if (game.loc == LOC_GIANTROOM) {
rspeak(START_OVER); rspeak(START_OVER);
} else { } else {
/* This is new begavior in Open Adventure - sounds better when /* This is new behavior in Open Adventure - sounds better when
* player isn't in the Giant Room. */ * player isn't in the Giant Room. */
rspeak(WELL_POINTLESS); rspeak(NOTHING_HAPPENS);
} }
game.foobar = WORD_EMPTY; game.foobar = WORD_EMPTY;
return GO_CLEAROBJ; return GO_CLEAROBJ;

3
notes.adoc
View file

@ -53,8 +53,7 @@ Bug fixes:
* Behavior when saying the giant's magic words outside his room wasn't * Behavior when saying the giant's magic words outside his room wasn't
quite correct - the game responded as though the player were in quite correct - the game responded as though the player were in
the room ("...can't you read?"). The new message is "Well, that was the room ("...can't you read?"). The new message is "Nothing happens."
remarkably pointless."
* Attempting to extinguish an unlit urn caused it to lose its oil. * Attempting to extinguish an unlit urn caused it to lose its oil.

2
tests/illformed.chk
View file

@ -343,7 +343,7 @@ You can't unlock the keys.
> find foo > find foo
Well, that was remarkably pointless. Nothing happens.
> find bar > find bar