Structurize object info.

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index 8e37374591b165bd7787be8245aecdd58f2255f3..d3eeb0aa7848d9d448a5460eea09c05acb6dbc41 100644 (file)
--- a/score.c
+++ b/score.c
@@ -48,9 +48,9 @@ int score(enum termination mode)
                 k = 14;
             if (i > CHEST)
                 k = 16;
-            if (game.prop[i] > STATE_NOTFOUND)
+            if (game.objects[i].prop > STATE_NOTFOUND)
                 score += 2;
-            if (game.place[i] == LOC_BUILDING && game.prop[i] == STATE_FOUND)
+            if (game.objects[i].place == LOC_BUILDING && game.objects[i].prop == STATE_FOUND)
                 score += k - 2;
             mxscor += k;
         }
@@ -86,7 +86,7 @@ int score(enum termination mode)
     mxscor += 45;
 
     /* Did he come to Witt's End as he should? */
-    if (game.place[MAGAZINE] == LOC_WITTSEND)
+    if (game.objects[MAGAZINE].place == LOC_WITTSEND)
         score += 1;
     mxscor += 1;