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