- goto Lclearobj;
- }
- if (command.id1 == ENTER && 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.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");
- }
- }
- if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD))
- {
- command.id1 = CARRY;
- command.type1 = ACTION;
- strncpy(command.raw2, "CATCH", LINESIZE - 1);
- command.wd1 = token_to_packed("CATCH");
- }
- }
-Lookup:
- if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) {
- if (++game.iwest == 10)
- rspeak(W_IS_WEST);
- }
- if (strncasecmp(command.raw1, "go", sizeof("go")) == 0 && command.id2 != WORD_EMPTY) {
- if (++game.igo == 10)
- rspeak(GO_UNNEEDED);
- }
- packed_to_token(command.wd1, word1);
- long defn;
- enum wordtype type;
- get_vocab_metadata(word1, &defn, &type);
- if (command.id1 == WORD_NOT_FOUND) {
- if (fallback_handler(command))
- continue;
- /* Gee, I don't understand. */
- sspeak(DONT_KNOW, command.raw1);
- goto Lclearobj;
- }
- switch (type) {
- case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
- case MOTION:
- playermove(command.id1);
- return true;
- case OBJECT:
- command.part = unknown;
- command.obj = command.id1;
- break;
- case ACTION:
- command.part = intransitive;
- command.verb = defn;
- break;
- case SPECIAL:
- speak(specials[command.id1].message);
- goto Lclearobj;
- default:
- BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
- }
+ switch (command.word[0].type) {
+ case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
+ case MOTION:
+ playermove(command.word[0].id);
+ return true;
+ case OBJECT:
+ command.part = unknown;
+ command.obj = command.word[0].id;
+ break;
+ case ACTION:
+ if (command.word[1].type == NUMERIC)
+ command.part = transitive;
+ else
+ command.part = intransitive;
+ command.verb = command.word[0].id;
+ break;
+ case NUMERIC:
+ if (!settings.oldstyle) {
+ sspeak(DONT_KNOW, command.word[0].raw);
+ clear_command(&command);
+ command_given = false;
+ }
+ break;
+ default: // LCOV_EXCL_LINE
+ BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
+ }