X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=score.c;h=8bd3cce1793af69a20c7b186a99ba58f7c27de1b;hp=00ee001dafd69ca200334637fbd5b0b50bddba38;hb=3d2ba1835544af309723e7502d0311d5f14ec99d;hpb=8bc08773fa4ac22f7fd3c89d8e8be92d2cab616a

diff --git a/score.c b/score.c
index 00ee001..8bd3cce 100644
--- a/score.c
+++ b/score.c
@@ -45,9 +45,9 @@ long score(enum termination mode)
                 k = 14;
             if (i > CHEST)
                 k = 16;
-            if (game.prop[i] >= 0)
+            if (game.prop[i] > STATE_NOTFOUND)
                 score += 2;
-            if (game.place[i] == LOC_BUILDING && game.prop[i] == 0)
+            if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_FOUND)
                 score += k - 2;
             mxscor += k;
         }
@@ -71,13 +71,13 @@ long score(enum termination mode)
         score += 25;
     mxscor += 25;
     if (game.closed) {
-        if (game.bonus == 0)
+        if (game.bonus == none)
             score += 10;
-        if (game.bonus == SPLATTER_MESSAGE)
+        if (game.bonus == splatter)
             score += 25;
-        if (game.bonus == DEFEAT_MESSAGE)
+        if (game.bonus == defeat)
             score += 30;
-        if (game.bonus == VICTORY_MESSAGE)
+        if (game.bonus == victory)
             score += 45;
     }
     mxscor += 45;