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

Simplify overcomplicated code.

Browse source
This commit is contained in:
Eric S. Raymond 2017-08-03 14:22:38 -04:00
parent 2d618410b8
commit 0468da2cdf
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main.c
View file

@ -1121,17 +1121,16 @@ Lclearobj:
command.word[0].id = ENTRANCE;
}
}
if (!((command.word[0].id != WATER && command.word[0].id != OIL) || (command.word[1].id != PLANT && command.word[1].id != DOOR))) {
if ((command.word[0].id == WATER || command.word[0].id == OIL) && (command.word[1].id == PLANT || command.word[1].id == DOOR)) {
if (AT(command.word[1].id)) {
command.word[1].id = POUR;
command.word[1].type = ACTION;
strncpy(command.word[1].raw, "POUR", LINESIZE - 1);
strncpy(command.word[1].raw, "pour", LINESIZE - 1);
}
}
if (command.word[0].id == CAGE && command.word[1].id == BIRD && HERE(CAGE) && HERE(BIRD)) {
command.word[0].id = CARRY;
command.word[0].type = ACTION;
strncpy(command.word[1].raw, "CATCH", LINESIZE - 1);
}
}