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

diff --git a/score.c b/score.c
index 4e72950..368b1df 100644
--- a/score.c
+++ b/score.c
@@ -1,19 +1,21 @@
-#include <stdlib.h>
-#include "advent.h"
-#include "database.h"
-#include "newdb.h"
-
 /*
- * scoring and wrap-up
+ * Scoring and wrap-up.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
  */
+#include <stdlib.h>
+#include "advent.h"
+#include "dungeon.h"
 
-static long mxscor;	/* ugh..the price for having score() not exit. */
+static int mxscor;	/* ugh..the price for having score() not exit. */
 
 long score(enum termination mode)
 /* mode is 'scoregame' if scoring, 'quitgame' if quitting, 'endgame' if died
  * or won */
 {
-    long score = 0;
+    int score = 0;
 
     /*  The present scoring algorithm is as follows:
      *     Objective:          Points:        Present total possible:
@@ -38,15 +40,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)
+            int k = 12;
+            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 +67,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;
@@ -89,7 +95,7 @@ long score(enum termination mode)
     mxscor += 2;
 
     /* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
-    for (long i = 0; i < NHINTS; i++) {
+    for (int i = 0; i < NHINTS; i++) {
         if (game.hinted[i])
             score = score - hints[i].penalty;
     }
@@ -117,17 +123,17 @@ void terminate(enum termination mode)
     if (points + game.saved + 1 >= mxscor && game.saved != 0)
         rspeak(WITHOUT_SUSPENDS);
     rspeak(TOTAL_SCORE, points, mxscor, game.turns, game.turns);
-    for (long i = 1; i <= (long)NCLASSES; i++) {
+    for (int i = 1; i <= (long)NCLASSES; i++) {
         if (classes[i].threshold >= points) {
             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 */