Confine uses of PROP_STASHIFY() to advent.h

Now it shouyld be possible to manipulate a stashed flag by only
changing macros.
This commit is contained in:
Eric S. Raymond 2024-09-22 23:09:16 -04:00
parent 08f0351817
commit 9a6e4406f5
2 changed files with 2 additions and 2 deletions

View file

@ -406,8 +406,7 @@ static phase_codes_t vcarry(verb_t verb, obj_t obj) {
game.objects[BIRD].prop = BIRD_CAGED;
}
if ((obj == BIRD || obj == CAGE) &&
(game.objects[BIRD].prop == BIRD_CAGED ||
PROP_STASHIFY(game.objects[BIRD].prop) == BIRD_CAGED)) {
OBJECT_STATE_EQUALS(BIRD, BIRD_CAGED)) {
/* expression maps BIRD to CAGE and CAGE to BIRD */
carry(BIRD + CAGE - obj, game.loc);
}