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

First nontrivial replacement of object state test by macro.

Browse source 
Test was game.objects[i].prop >= 0, but we know that state -1
(STATE_NOTFOUND) can't occiur here because the object is in
a lit room.
This commit is contained in:
Eric S. Raymond 2023-04-08 20:02:27 -04:00
parent 02987d0330
commit c82d1214fa
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions.c
View file

@ -1099,7 +1099,7 @@ static phase_codes_t read(command_t command)
if (command.obj == INTRANSITIVE) { if (command.obj == INTRANSITIVE) {
command.obj = NO_OBJECT; command.obj = NO_OBJECT;
for (int i = 1; i <= NOBJECTS; i++) { for (int i = 1; i <= NOBJECTS; i++) {
if (HERE(i) && objects[i].texts[0] != NULL && game.objects[i].prop >= 0) if (HERE(i) && objects[i].texts[0] != NULL && !PROP_IS_STASHED(i))
command.obj = command.obj * NOBJECTS + i; command.obj = command.obj * NOBJECTS + i;
} }
if (command.obj > NOBJECTS || command.obj == NO_OBJECT || DARK(game.loc)) if (command.obj > NOBJECTS || command.obj == NO_OBJECT || DARK(game.loc))