- if (command->wd2 > 0) {
- command->wd1 = command->wd2;
- strncpy(command->raw1, command->raw2, LINESIZE - 1);
- }
- char word1[TOKLEN + 1];
- packed_to_token(command->wd1, word1);
- int wd = (int) get_vocab_id(word1);
- if (wd == MOTION_WORD(XYZZY) ||
- wd == MOTION_WORD(PLUGH) ||
- wd == MOTION_WORD(PLOVER) ||
- wd == ACTION_WORD(FEE) ||
- wd == ACTION_WORD(FIE) ||
- wd == ACTION_WORD(FOE) ||
- wd == ACTION_WORD(FOO) ||
- wd == ACTION_WORD(FUM) ||
- wd == ACTION_WORD(PART)) {
- /* FIXME: scribbles on the interpreter's command block */
- wordclear(&command->wd2);
- return GO_LOOKUP;
- }
- sspeak(OKEY_DOKEY, command->raw1);
+ char word2[TOKLEN + 1];
+ packed_to_token(command->wd2, word2);
+ long wd;
+ enum wordtype type;
+ get_vocab_metadata(word2, &wd, &type);
+ if (wd == XYZZY ||
+ wd == PLUGH ||
+ wd == PLOVER ||
+ wd == FEE ||
+ wd == FIE ||
+ wd == FOE ||
+ wd == FOO ||
+ wd == FUM ||
+ wd == PART) {
+ return GO_WORD2;
+ }
+ sspeak(OKEY_DOKEY, command->raw2);