Unspk'd find

This commit is contained in:
NHOrus 2017-07-04 11:49:02 +03:00
parent ffd08893dd
commit de5696431d

View file

@ -725,17 +725,26 @@ int fill(token_t verb, token_t obj)
static int find(token_t verb, token_t obj) static int find(token_t verb, token_t obj)
/* Find. Might be carrying it, or it might be here. Else give caveat. */ /* Find. Might be carrying it, or it might be here. Else give caveat. */
{ {
int spk = actions[verb].message; if (TOTING(obj)) {
rspeak(ALREADY_CARRYING);
return GO_CLEAROBJ;
}
if (game.closed) {
rspeak(NEEDED_NEARBY);
return GO_CLEAROBJ;
}
if (AT(obj) || if (AT(obj) ||
(LIQUID() == obj && AT(BOTTLE)) || (LIQUID() == obj && AT(BOTTLE)) ||
obj == LIQLOC(game.loc) || obj == LIQLOC(game.loc) ||
(obj == DWARF && atdwrf(game.loc) > 0)) (obj == DWARF && atdwrf(game.loc) > 0)) {
spk = YOU_HAVEIT; rspeak(YOU_HAVEIT);
if (game.closed) return GO_CLEAROBJ;
spk = NEEDED_NEARBY; }
if (TOTING(obj))
spk = ALREADY_CARRYING;
rspeak(spk); rspeak(actions[verb].message);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }