archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle word type and raw strings.

Browse source
This commit is contained in:
Jason S. Ninneman 2017-07-12 12:10:00 -07:00
parent 820737fb80
commit ff6a816e5f
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
main.c
View file

@ -1123,18 +1123,26 @@ Lclosecheck:
} }
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.id1 = command.id2; command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE + 1);
command.id2 = WORD_EMPTY; command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE;
strncpy(command.raw2, "", LINESIZE + 1);
} else { } else {
if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) {
if (AT(command.id2)) if (AT(command.id2))
{ {
command.id2 = POUR; command.id2 = POUR;
command.type2 = ACTION;
strncpy(command.raw2, "POUR", LINESIZE + 1);
command.wd2 = token_to_packed("POUR"); command.wd2 = token_to_packed("POUR");
} }
} }
if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD)) if (command.id1 == CAGE && command.id2 == BIRD && HERE(CAGE) && HERE(BIRD))
{ {
command.id1 = CARRY; command.id1 = CARRY;
command.type1 = ACTION;
strncpy(command.raw2, "CATCH", LINESIZE + 1);
command.wd1 = token_to_packed("CATCH"); command.wd1 = token_to_packed("CATCH");
} }
} }
@ -1148,10 +1156,10 @@ Lookup:
rspeak(GO_UNNEEDED); rspeak(GO_UNNEEDED);
} }
packed_to_token(command.wd1, word1); packed_to_token(command.wd1, word1);
long defn; long defn;
enum wordtype type; enum wordtype type;
get_vocab_metadata(word1, &defn, &type); get_vocab_metadata(word1, &defn, &type);
if (defn == WORD_NOT_FOUND) { if (command.id1 == WORD_NOT_FOUND) {
if (fallback_handler(command)) if (fallback_handler(command))
continue; continue;
/* Gee, I don't understand. */ /* Gee, I don't understand. */
@ -1193,11 +1201,13 @@ Lookup:
case GO_WORD2: case GO_WORD2:
/* Get second word for analysis. */ /* Get second word for analysis. */
command.id1 = command.id2; command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);
command.wd1 = command.wd2;
command.id2 = WORD_EMPTY; command.id2 = WORD_EMPTY;
command.wd1 = command.wd2; command.type2 = NO_WORD_TYPE;
strncpy(command.raw1, command.raw2, LINESIZE - 1); command.raw2[0] = '\0';
wordclear(&command.wd2); wordclear(&command.wd2);
command.raw2[0] = '\0';
goto Lookup; goto Lookup;
case GO_UNKNOWN: case GO_UNKNOWN:
/* Random intransitive verbs come here. Clear obj just in case /* Random intransitive verbs come here. Clear obj just in case