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

More nontrivial macro abstraction of state checks.

Browse source 
game.prop < 0 becomes an alternation of macros.
This commit is contained in:
Eric S. Raymond 2023-04-08 20:20:36 -04:00
parent c82d1214fa
commit 191d3cb043
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.c
View file

@ -1098,10 +1098,10 @@ static bool do_command(void)
* game.prop < 0 and stash them. This way objects won't be * game.prop < 0 and stash them. This way objects won't be
* described until they've been picked up and put down * described until they've been picked up and put down
* separate from their respective piles. */ * separate from their respective piles. */
if (game.objects[OYSTER].prop < 0 && TOTING(OYSTER)) if ((PROP_IS_NOTFOUND(OYSTER) || PROP_IS_STASHED(OYSTER)) && TOTING(OYSTER))
pspeak(OYSTER, look, true, 1); pspeak(OYSTER, look, true, 1);
for (size_t i = 1; i <= NOBJECTS; i++) { for (size_t i = 1; i <= NOBJECTS; i++) {
if (TOTING(i) && game.objects[i].prop < 0) if (TOTING(i) && (PROP_IS_NOTFOUND(i) || PROP_IS_STASHED(i)))
game.objects[i].prop = PROP_STASHED(i); game.objects[i].prop = PROP_STASHED(i);
} }
} }