static bool get_command_input(struct command_t *command)
{
char inputbuf[LINESIZE];
- char word1[TOKLEN + 1];
- char word2[TOKLEN + 1];
char* input;
for (;;) {
tokenize(inputbuf, command);
- packed_to_token(command->wd1, word1);
- packed_to_token(command->wd2, word2);
- get_vocab_metadata(word1, &(command->id1), &(command->type1));
- get_vocab_metadata(word2, &(command->id2), &(command->type2));
+ get_vocab_metadata(command->raw1, &(command->id1), &(command->type1));
+ get_vocab_metadata(command->raw2, &(command->id2), &(command->type2));
return true;
}
/* Get and execute a command */
{
static struct command_t command;
- char word1[TOKLEN + 1];
command.verb = 0;
} else
lampcheck();
- if (command.id1 == ENTER && (command.id2 == STREAM ||
- command.id2 == WATER)) {
+ if (command.type1 == MOTION && command.id1 == ENTER
+ && (command.id2 == STREAM || command.id2 == WATER)) {
if (LIQLOC(game.loc) == WATER)
rspeak(FEET_WET);
else
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 (command.type1 == OBJECT) {
+ if (command.id1 == GRATE) {
+ command.type1 = MOTION;
+ if (game.loc == LOC_START ||
+ game.loc == LOC_VALLEY ||
+ game.loc == LOC_SLIT) {
+ command.id1 = DEPRESSION;
+ }
+ if (game.loc == LOC_COBBLE ||
+ game.loc == LOC_DEBRIS ||
+ game.loc == LOC_AWKWARD ||
+ game.loc == LOC_BIRD ||
+ game.loc == LOC_PITTOP) {
+ command.id1 = ENTRANCE;
+ }
+ }
+ 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)
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;
sspeak(DONT_KNOW, command.raw1);
goto Lclearobj;
}
- switch (type) {
+ switch (command.type1) {
case NO_WORD_TYPE: // FIXME: treating NO_WORD_TYPE as a motion word is confusing
case MOTION:
playermove(command.id1);
break;
case ACTION:
command.part = intransitive;
- command.verb = defn;
+ command.verb = command.id1;
break;
case SPECIAL:
speak(specials[command.id1].message);
return true;
case GO_TOP:
continue; /* back to top of main interpreter loop */
- case GO_LOOKUP:
- goto Lookup;
case GO_WORD2:
/* Get second word for analysis. */
command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);
- command.wd1 = command.wd2;
command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE;
command.raw2[0] = '\0';
- wordclear(&command.wd2);
goto Lookup;
case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case