Do not base endgame bonus on arbitrary messages

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index e858681c40b535cbb82becdeb08c1e9d03741550..8bd3cce1793af69a20c7b186a99ba58f7c27de1b 100644 (file)
--- a/score.c
+++ b/score.c
@@ -47,7 +47,7 @@ long score(enum termination mode)
                 k = 16;
             if (game.prop[i] > STATE_NOTFOUND)
                 score += 2;
                 k = 16;
             if (game.prop[i] > STATE_NOTFOUND)
                 score += 2;

-            if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_GROUND)
+            if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_FOUND)

                 score += k - 2;
             mxscor += k;
         }
                 score += k - 2;
             mxscor += k;
         }


@@ -71,13 +71,13 @@ long score(enum termination mode)
         score += 25;
     mxscor += 25;
     if (game.closed) {
         score += 25;
     mxscor += 25;
     if (game.closed) {

-        if (game.bonus == 0)
+        if (game.bonus == none)

             score += 10;
             score += 10;

-        if (game.bonus == SPLATTER_MESSAGE)
+        if (game.bonus == splatter)

             score += 25;
             score += 25;

-        if (game.bonus == DEFEAT_MESSAGE)
+        if (game.bonus == defeat)

             score += 30;
             score += 30;

-        if (game.bonus == VICTORY_MESSAGE)
+        if (game.bonus == victory)

             score += 45;
     }
     mxscor += 45;
             score += 45;
     }
     mxscor += 45;