Simplify SPDX copyright lines to the shortest canonical form...

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index d3eeb0aa7848d9d448a5460eea09c05acb6dbc41..1c9a397fe64b6771dbb17675a00ff9721a552f33 100644 (file)
--- a/score.c
+++ b/score.c
@@ -1,8 +1,7 @@
 /*
  * Scoring and wrap-up.
  *
- * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <stdlib.h>
@@ -48,9 +47,9 @@ int score(enum termination mode)
                 k = 14;
             if (i > CHEST)
                 k = 16;
-            if (game.objects[i].prop > STATE_NOTFOUND)
+            if (!PROP_IS_STASHED(i) && !PROP_IS_NOTFOUND(i))
                 score += 2;
-            if (game.objects[i].place == LOC_BUILDING && game.objects[i].prop == STATE_FOUND)
+            if (game.objects[i].place == LOC_BUILDING && PROP_IS_FOUND(i))
                 score += k - 2;
             mxscor += k;
         }
@@ -96,7 +95,7 @@ int score(enum termination mode)
 
     /* Deduct for hints/turns/saves. Hints < 4 are special; see database desc. */
     for (int i = 0; i < NHINTS; i++) {
-        if (game.hinted[i])
+        if (game.hints[i].used)
             score = score - hints[i].penalty;
     }
     if (game.novice)