- /* FIXME: Magic numbers related to vocabulary */
- if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
- (command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
- if (AT(DEMOTE_WORD(command.id2)))
- command.wd2 = token_to_packed("POUR");
+ if (closecheck()) {
+ if (game.closed)
+ return true;
+ } else
+ lampcheck();
+
+ if (command.id1 == ENTER && (command.id2 == STREAM ||
+ command.id2 == PROMOTE_WORD(WATER))) {
+ if (LIQLOC(game.loc) == WATER) {
+ rspeak(FEET_WET);
+ } else {
+ rspeak(WHERE_QUERY);
+ }
+ goto Lclearobj;
+ }
+ if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
+ /* command.wd1 = command.wd2; */
+ /* wordclear(&command.wd2); */
+ command.id1 = command.id2;
+ command.id2 = WORD_EMPTY;
+ } else {
+ /* FIXME: Magic numbers related to vocabulary */
+ if (!((command.id1 != PROMOTE_WORD(WATER) && command.id1 != PROMOTE_WORD(OIL)) ||
+ (command.id2 != PROMOTE_WORD(PLANT) && command.id2 != PROMOTE_WORD(DOOR)))) {
+ if (AT(DEMOTE_WORD(command.id2)))
+ command.wd2 = token_to_packed("POUR");
+ }
+ if (command.id1 == PROMOTE_WORD(CAGE) && command.id2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
+ command.wd1 = token_to_packed("CATCH");