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

Fix for Gitlab issue #65: revisiting "fee fie foe foo" and "fum".

Browse source 
100% coverage, "make oldcompare" passes.
This commit is contained in:
Eric S. Raymond 2023-04-03 09:24:21 -04:00
parent 0a1f5dbb43
commit 2dd1ccc535
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
actions.c
View file

@ -202,10 +202,9 @@ static phase_codes_t bigwords(vocab_t id)
if ((foobar == WORD_EMPTY && id == FEE) ||
(foobar == FEE && id == FIE) ||
(foobar == FIE && id == FOE) ||
(foobar == FOE && id == FOO) ||
(foobar == FOE && id == FUM)) {
(foobar == FOE && id == FOO)) {
game.foobar = id;
if ((id != FOO) && (id != FUM)) {
if (id != FOO) {
rspeak(OK_MAN);
return GO_CLEAROBJ;
}
@ -214,8 +213,6 @@ static phase_codes_t bigwords(vocab_t id)
(TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ;
} else if (id == FUM) {
goto fum;
} else {
/* Bring back troll if we steal the eggs back from him before
* crossing. */
@ -232,7 +229,6 @@ static phase_codes_t bigwords(vocab_t id)
return GO_CLEAROBJ;
}
} else {
fum:
rspeak(START_OVER);
game.foobar = WORD_EMPTY;
return GO_CLEAROBJ;