Fix up copyright notices. SPDX wants only one per file.

[open-adventure.git] / score.c

diff --git a/score.c b/score.c
index ed9cdeda34263281610372603e9da659ff906979..9d3d63f4129a9215c737210e9fdfeabb3428e450 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: Copyright 977, 2005 by Will Crowther and Don Woods, Copyright, 2017 by Eric S. Raymond
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <stdlib.h>
@@ -48,7 +47,7 @@ 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 && PROP_IS_FOUND(i))
                 score += k - 2;