Back out the behavior change to magic words outside the Giant's Room.
There are twi reasons for this. One is to decompolicate verifying the fix for issue $85: revisiting "fee fie foe foo" and "fum". The other is because I'm now convinced that the test should notr be "Are you in the Giant's Room" but :Have you read the grafitti there?
This commit is contained in:
parent
d9ddf4d805
commit
b86d4afd20
3 changed files with 4 additions and 15 deletions
|
@ -228,13 +228,7 @@ static phase_codes_t bigwords(vocab_t id)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fum:
|
fum:
|
||||||
if (game.loc == LOC_GIANTROOM || settings.oldstyle) {
|
|
||||||
rspeak(START_OVER);
|
rspeak(START_OVER);
|
||||||
} else {
|
|
||||||
/* This is new behavior in Open Adventure - sounds better when
|
|
||||||
* player isn't in the Giant Room. */
|
|
||||||
rspeak(NOTHING_HAPPENS);
|
|
||||||
}
|
|
||||||
game.foobar = WORD_EMPTY;
|
game.foobar = WORD_EMPTY;
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,11 +53,6 @@ Bug fixes:
|
||||||
|
|
||||||
* Response to an attempt to unlock the oyster while carrying it was incorrect.
|
* Response to an attempt to unlock the oyster while carrying it was incorrect.
|
||||||
|
|
||||||
* Behavior when saying the giant's magic words outside his room wasn't
|
|
||||||
quite correct - the game responded as though the player were in
|
|
||||||
the room ("...can't you read?"). The new message is "Nothing happens."
|
|
||||||
The -o option reverts this change.
|
|
||||||
|
|
||||||
* Attempting to extinguish an unlit urn caused it to lose its oil.
|
* Attempting to extinguish an unlit urn caused it to lose its oil.
|
||||||
|
|
||||||
* "A crystal bridge now spans the fissure." (progressive present) was
|
* "A crystal bridge now spans the fissure." (progressive present) was
|
||||||
|
|
|
@ -15,11 +15,11 @@ You're in front of building.
|
||||||
|
|
||||||
> foo
|
> foo
|
||||||
|
|
||||||
Nothing happens.
|
What's the matter, can't you read? Now you'd best start over.
|
||||||
|
|
||||||
> say foo
|
> say foo
|
||||||
|
|
||||||
Nothing happens.
|
What's the matter, can't you read? Now you'd best start over.
|
||||||
|
|
||||||
> in
|
> in
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ OK
|
||||||
|
|
||||||
> find foo
|
> find foo
|
||||||
|
|
||||||
Nothing happens.
|
What's the matter, can't you read? Now you'd best start over.
|
||||||
|
|
||||||
> z
|
> z
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue