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

Add some word-type checking where it's needed.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-20 07:02:35 -04:00
parent d998965faf
commit 360adc8bfb
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.c
View file

@ -1129,14 +1129,16 @@ Lclearobj:
goto Lclearobj; goto Lclearobj;
} }
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
/* Ugly translationms to get around word polyvalence. */
if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.id1 = command.id2; command.id1 = command.id2;
command.type1 = command.type2; command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1); strncpy(command.raw1, command.raw2, LINESIZE - 1);
command.id2 = WORD_EMPTY; command.id2 = WORD_EMPTY;
command.type2 = NO_WORD_TYPE; command.type2 = NO_WORD_TYPE;
strncpy(command.raw2, "", LINESIZE - 1); strncpy(command.raw2, "", LINESIZE - 1);
} else { } else if (command.type1 == OBJECT) {
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;
@ -1152,6 +1154,7 @@ Lclearobj:
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)