projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for Gitlab issue #65: revisiting "fee fie foe foo" and "fum".
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 936e4d80978d9aeebfc135a6576e2be9c109d7f2..05c59d5def25b248365282abbf6dfcf184c02489 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-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) ||
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;
game.foobar = id;
- if (
(id != FOO) && (id != FUM)
) {
+ if (
id != FOO
) {
rspeak(OK_MAN);
return GO_CLEAROBJ;
}
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;
(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. */
} 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 {
return GO_CLEAROBJ;
}
} else {
-fum:
rspeak(START_OVER);
game.foobar = WORD_EMPTY;
return GO_CLEAROBJ;
rspeak(START_OVER);
game.foobar = WORD_EMPTY;
return GO_CLEAROBJ;