X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=score.c;h=531b230cfbbc154ddddae4625f6c4bf02d49f0af;hb=db281a96d70a43c6a6d5b516eceb6e4f67637c57;hp=95efe2c512236166cda0ac3122c07ea2ef122595;hpb=985137d9c7ed18ee0777622874efe944218cae6a;p=open-adventure.git

diff --git a/score.c b/score.c
index 95efe2c..531b230 100644
--- a/score.c
+++ b/score.c
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include "advent.h"
-#include "database.h"
 #include "newdb.h"
 
 /*
@@ -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;