From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 23 Sep 2024 02:21:47 +0000 (-0400)
Subject: Remove an unneeded layer of macro indirection.
X-Git-Tag: 1.20~9
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=0157e5866872f9b2e6f0b8f875ad9696f658944b;p=open-adventure.git

Remove an unneeded layer of macro indirection.
---

diff --git a/actions.c b/actions.c
index 27b7904..107b298 100644
--- a/actions.c
+++ b/actions.c
@@ -407,7 +407,7 @@ static phase_codes_t vcarry(verb_t verb, obj_t obj) {
 	}
 	if ((obj == BIRD || obj == CAGE) &&
 	    (game.objects[BIRD].prop == BIRD_CAGED ||
-	     OBJECT_STASHED(BIRD) == BIRD_CAGED)) {
+	     PROP_STASHIFY(game.objects[BIRD].prop) == BIRD_CAGED)) {
 		/* expression maps BIRD to CAGE and CAGE to BIRD */
 		carry(BIRD + CAGE - obj, game.loc);
 	}
diff --git a/advent.h b/advent.h
index 9f306c1..9841037 100644
--- a/advent.h
+++ b/advent.h
@@ -61,7 +61,7 @@
  * STATE_NOTFOUND is only set on treasures. Non-treasures start the
  * game in STATE_FOUND.
  *
- * OBJECT_STASHED is supposed to map a state property value to a
+ * PROP_STASHIFY is supposed to map a state property value to a
  * negative range, where the object cannot be picked up but the value
  * can be recovered later.  Various objects get this property when
  * the cave starts to close. Only seems to be significant for the bird
@@ -100,7 +100,6 @@
 #define OBJECT_IS_NOTFOUND2(g, o) (!g.objects[o].found)
 #define OBJECT_SET_SEEN(obj) game.objects[object].found = true
 #endif
-#define OBJECT_STASHED(obj) PROP_STASHIFY(game.objects[obj].prop)
 
 #define PROMPT "> "
 
diff --git a/main.c b/main.c
index 4db3836..688cfc7 100644
--- a/main.c
+++ b/main.c
@@ -1276,7 +1276,7 @@ static bool do_command(void) {
 					    (OBJECT_IS_NOTFOUND(i) ||
 					     OBJECT_IS_STASHED(i))) {
 						game.objects[i].prop =
-						    OBJECT_STASHED(i);
+						    PROP_STASHIFY(game.objects[i].prop);
 					}
 				}
 			}