Eliminate thew last property inequality outside a macro.

diff --git a/actions.c b/actions.c
index e5f2e70524ac0d89f030f1bc0831f55525a8acab..1786c530130a3d61911c455a00fd912cb868c773 100644 (file)
--- 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;