From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 23 Sep 2024 09:08:11 +0000 (-0400)
Subject: Eliminate thew last property inequality outside a macro.
X-Git-Tag: 1.20~3
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=92451f1fff194355ccc4c770ddc54944ec7fda6a;p=open-adventure.git

Eliminate thew last property inequality outside a macro.
---

diff --git a/actions.c b/actions.c
index e5f2e70..1786c53 100644
--- a/actions.c
+++ b/actions.c
@@ -329,8 +329,7 @@ static phase_codes_t vcarry(verb_t verb, obj_t obj) {
 	if (game.objects[obj].fixed != IS_FREE) {
 		switch (obj) {
 		case PLANT:
-			/* Next guard tests whether plant is tiny or stashed */
-			rspeak(game.objects[PLANT].prop <= PLANT_THIRSTY
+			rspeak((game.objects[PLANT].prop == PLANT_THIRSTY || OBJECT_IS_STASHED(PLANT))
 			           ? DEEP_ROOTS
 			           : YOU_JOKING);
 			break;