Unshadowed k2 into k3 in main.c

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index 95efe2c512236166cda0ac3122c07ea2ef122595..1e4e5c2d4e81acdb9e9a98d3ee15aa7b52db2895 100644 (file)
--- 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
@@ -37,8 +36,10 @@ long score(enum termination mode)
     /*  First tally up the treasures.  Must be in building and not broken.
      *  Give the poor guy 2 points just for finding each treasure. */
     mxscor = 0;
-    for (long i = MINTRS; i <= MAXTRS; i++) {
-        if (object_descriptions[i].inventory != 0) {
+    for (int i = 1; i <= NOBJECTS; i++) {
+        if (!objects[i].is_treasure)
+            continue;
+        if (objects[i].inventory != 0) {
             long k = 12;
             if (i == CHEST)k = 14;
             if (i > CHEST)k = 16;