From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 9 Apr 2023 01:17:55 +0000 (-0400)
Subject: Turn an odd test into a macro disjunction.
X-Git-Tag: 1.16~10
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=9e9731d59b79a1a7c4bd4583d621ec125849220a;p=open-adventure.git

Turn an odd test into a macro disjunction.

Was game.objects[i].prop > STATE_NOTFOUND.

This finishes off all the statec comparisons we want to macroize.
---

diff --git a/score.c b/score.c
index ed9cded..c0a0277 100644
--- a/score.c
+++ b/score.c
@@ -48,7 +48,7 @@ int score(enum termination mode)
                 k = 14;
             if (i > CHEST)
                 k = 16;
-            if (game.objects[i].prop > STATE_NOTFOUND)
+            if (!PROP_IS_STASHED(i) && !PROP_IS_NOTFOUND(i))
                 score += 2;
             if (game.objects[i].place == LOC_BUILDING && PROP_IS_FOUND(i))
                 score += k - 2;