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

Improved word type checking.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-20 07:40:19 -04:00
parent 52723acb72
commit 3f90f5bf38
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.c
View file

@ -1120,8 +1120,8 @@ Lclearobj:
} 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
@ -1131,7 +1131,8 @@ Lclearobj:
}
/* Ugly translationms to get around word polyvalence. */
if (command.type1 == ACTION && command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
if (command.type1 == ACTION && command.id1 == SAY
&& command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
command.id1 = command.id2;
command.type1 = command.type2;
strncpy(command.raw1, command.raw2, LINESIZE - 1);