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

Abstract out some state arithmetic.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-04 13:40:05 -04:00
parent 4ac9df527b
commit a8ac2f477a
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
actions.c
View file

@ -361,7 +361,7 @@ static int vcarry(token_t verb, token_t obj)
}
if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && -1 - game.prop[BIRD] != BIRD_CAGED) {
if (obj == BIRD && game.prop[BIRD] != BIRD_CAGED && STASHED(BIRD) != BIRD_CAGED) {
if (game.prop[BIRD] == BIRD_FOREST_UNCAGED) {
DESTROY(BIRD);
rspeak(BIRD_CRAP);
@ -380,8 +380,7 @@ static int vcarry(token_t verb, token_t obj)
/* FIXME: Arithmetic on state numbers */
if ((obj == BIRD ||
obj == CAGE) &&
(game.prop[BIRD] == BIRD_CAGED ||
-1 - game.prop[BIRD] == 1))
(game.prop[BIRD] == BIRD_CAGED || STASHED(BIRD) == BIRD_CAGED))
carry(BIRD + CAGE - obj, game.loc);
carry(obj, game.loc);
if (obj == BOTTLE && LIQUID() != NO_OBJECT)