Partially address GitLab issue #27: arbitrary_messages unreachable

This commit is contained in:
Eric S. Raymond 2017-07-14 11:33:22 -04:00
parent 7f18e66866
commit 66fba512a7
6 changed files with 29 additions and 11 deletions

View file

@ -995,7 +995,7 @@ static int lock(verb_t verb, obj_t obj)
if (verb == LOCK)
rspeak(HUH_MAN);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
rspeak(CLAM_OPENER);
else {
DESTROY(CLAM);
drop(OYSTER, game.loc);
@ -1006,8 +1006,12 @@ static int lock(verb_t verb, obj_t obj)
case OYSTER:
if (verb == LOCK)
rspeak(HUH_MAN);
else
else if (TOTING(OYSTER))
rspeak(DROP_OYSTER);
else if (!TOTING(TRIDENT))
rspeak(OYSTER_OPENER);
else
rspeak(OYSTER_OPENS);
break;
case DOOR:
rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);