X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=actions.c;h=9917199bc5bcef7bed8a7ca38ba1174ba1e63df4;hb=eb27776c99068914abf60b5cbea47f3cc072f8a7;hp=5460848f95a93d7c10fa3f80fe82d8032eae251c;hpb=e7dc3eab5d7eb798199e59081e846582af7205a7;p=open-adventure.git diff --git a/actions.c b/actions.c index 5460848..9917199 100644 --- a/actions.c +++ b/actions.c @@ -998,6 +998,8 @@ static phase_codes_t lock(verb_t verb, obj_t obj) case CLAM: if (verb == LOCK) rspeak(HUH_MAN); + else if (TOTING(CLAM)) + rspeak(DROP_CLAM); else if (!TOTING(TRIDENT)) rspeak(CLAM_OPENER); else { @@ -1103,8 +1105,14 @@ static phase_codes_t read(command_t command) if (DARK(game.loc)) { sspeak(NO_SEE, command.word[0].raw); - } else if (command.obj == OYSTER && !game.clshnt && game.closed) { - game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); + } else if (command.obj == OYSTER) { + if (!TOTING(OYSTER) || !game.closed) { + rspeak(DONT_UNDERSTAND); + } else if (!game.clshnt) { + game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); + } else if (game.clshnt) { + pspeak(OYSTER, hear, true, 1); // Not really a sound, but oh well. + } } else if (objects[command.obj].texts[0] == NULL || game.prop[command.obj] == STATE_NOTFOUND) { speak(actions[command.verb].message);