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

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index c688018d3e97ec31ef9b1f4dfc5b6da52205313b..2e7fdf2cc1169d1e4c6bc5fa1bd2a2000be78b9e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: Copyright 1977, 2005 by Will Crowther and Don Woods, Copyright 2017 by Eric S. Raymond
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
@@ -14,7 +13,6 @@
 #include <unistd.h>
 #include <editline/readline.h>
 #include "advent.h"
-#include "dungeon.h"
 
 #define DIM(a) (sizeof(a)/sizeof(a[0]))
 
@@ -860,7 +858,7 @@ static bool closecheck(void)
          *  snake is known to have been destroyed and needn't be
          *  carried away from its old "place"), making the various
          *  objects be handled differently.  We also drop all other 
-         *  objects he might be acrrying (lest he have some which
+         *  objects he might be carrying (lest he has some which
          *  could cause trouble, such as the keys).  We describe the
          *  flash of light and trundle back. */
         put(BOTTLE, LOC_NE, EMPTY_BOTTLE);
@@ -1098,10 +1096,11 @@ static bool do_command(void)
         while (command.state <= GIVEN) {
 
             if (game.closed) {
-                /*  If closing time, check for any objects being toted with
-                 *  game.prop < 0 and stash them.  This way objects won't be
-                 *  described until they've been picked up and put down
-                 *  separate from their respective piles. */
+                /*  If closing time, check for any stashed objects
+                 *  being toted and unstash them.  This way objects
+                 *  won't be described until they've been picked up
+                 *  and put down separate from their respective
+                 *  piles. */
                 if ((PROP_IS_NOTFOUND(OYSTER) || PROP_IS_STASHED(OYSTER)) && TOTING(OYSTER))
                     pspeak(OYSTER, look, true, 1);
                 for (size_t i = 1; i <= NOBJECTS; i++) {