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

Use vocab IDs along side packed words.

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

8
main.c
View file

@ -1127,11 +1127,17 @@ Lclosecheck:
} 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.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.wd1 = token_to_packed("CATCH"); command.wd1 = token_to_packed("CATCH");
} }
}
Lookup: Lookup:
if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) { if (strncasecmp(command.raw1, "west", sizeof("west")) == 0) {
if (++game.iwest == 10) if (++game.iwest == 10)
@ -1186,6 +1192,8 @@ Lookup:
goto Lookup; goto Lookup;
case GO_WORD2: case GO_WORD2:
/* Get second word for analysis. */ /* Get second word for analysis. */
command.id1 = command.id2;
command.id2 = WORD_EMPTY;
command.wd1 = command.wd2; command.wd1 = command.wd2;
strncpy(command.raw1, command.raw2, LINESIZE - 1); strncpy(command.raw1, command.raw2, LINESIZE - 1);
wordclear(&command.wd2); wordclear(&command.wd2);