- if (command.verb == SAY && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY)
- command.verb = 0;
- if (command.verb == SAY) {
- command.part = transitive;
- } else {
- 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");
+ /* Ugly translationms to get around word polyvalence. */
+ if (command.type1 == ACTION && command.id1 == SAY
+ && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
+ command.id1 = command.id2;
+ command.type1 = command.type2;
+ strncpy(command.raw1, command.raw2, LINESIZE - 1);
+ command.id2 = WORD_EMPTY;
+ command.type2 = NO_WORD_TYPE;
+ strncpy(command.raw2, "", LINESIZE - 1);
+ } else if (command.type1 == OBJECT) {
+ if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
+ if (AT(command.id2)) {
+ command.id2 = POUR;
+ command.type2 = ACTION;
+ strncpy(command.raw2, "POUR", LINESIZE - 1);
+ command.wd2 = token_to_packed("POUR");