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

diff --git a/score.c b/score.c
index 4e72950..8bd3cce 100644
--- a/score.c
+++ b/score.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include "advent.h"
-#include "database.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 /*
  * scoring and wrap-up
@@ -38,15 +37,17 @@ long score(enum termination mode)
      *  Give the poor guy 2 points just for finding each treasure. */
     mxscor = 0;
     for (int i = 1; i <= NOBJECTS; i++) {
-	if (!objects[i].is_treasure)
-	    continue;
+        if (!objects[i].is_treasure)
+            continue;
         if (objects[i].inventory != 0) {
             long k = 12;
-            if (i == CHEST)k = 14;
-            if (i > CHEST)k = 16;
-            if (game.prop[i] >= 0)
+            if (i == CHEST)
+                k = 14;
+            if (i > CHEST)
+                k = 16;
+            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;
         }
@@ -63,18 +64,20 @@ long score(enum termination mode)
     if (mode == endgame)
         score += 4;
     mxscor += 4;
-    if (game.dflag != 0)score += 25;
+    if (game.dflag != 0)
+        score += 25;
     mxscor += 25;
-    if (game.closng)score += 25;
+    if (game.closng)
+        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;
@@ -122,12 +125,12 @@ void terminate(enum termination mode)
             speak(classes[i].message);
             i = classes[i].threshold + 1 - points;
             rspeak(NEXT_HIGHER, i, i);
-            exit(0);
+            exit(EXIT_SUCCESS);
         }
     }
     rspeak(OFF_SCALE);
     rspeak(NO_HIGHER);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 /* end */