Partial REUSE cmpliance.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index f8aa9def25b8318884e91cf61db239c315f851f7..9a8d2e5a4054f6989ab962b404c346a17b0cbd85 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,9 +1,9 @@
 /*
  * I/O and support routines.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <unistd.h>
@@ -221,7 +221,7 @@ static char* get_input(void)
     // Print a blank line
     printf("\n");
 
-    char* input = "";
+    char* input;
     for (;;) {
         input = myreadline(input_prompt);
 
@@ -490,7 +490,7 @@ static void tokenize(char* raw, command_t *cmd)
     /* (ESR) In oldstyle mode, simulate the uppercasing and truncating
      * effect on raw tokens of packing them into sixbit characters, 5
      * to a 32-bit word.  This is something the FORTRAN version did
-     * becuse archaic FORTRAN had no string types.  Don Wood's
+     * because archaic FORTRAN had no string types.  Don Wood's
      * mechanical translation of 2.5 to C retained the packing and
      * thus this misfeature.
      *
@@ -602,7 +602,7 @@ loc_t put(obj_t object, loc_t where, int pval)
  *  negated game.prop values for the repository objects. */
 {
     move(object, where);
-    return STASHED(pval);
+    return (-1) - pval;;       // Needs to stay sinchronized with STASHED
 }
 
 void carry(obj_t object, loc_t where)
@@ -617,6 +617,13 @@ void carry(obj_t object, loc_t where)
             return;
         game.place[object] = CARRIED;
 
+       /*
+        * Without this conditional your inventory is overcounted
+        * when you pick up the bird while it's caged. This fixes
+        * a cosmetic bug in the original.
+        *
+        * Possibly this check should be skipped whwn oldstyle is on.
+        */
         if (object != BIRD)
             ++game.holdng;
     }
@@ -641,7 +648,7 @@ void drop(obj_t object, loc_t where)
         if (game.place[object] == CARRIED)
             if (object != BIRD)
                 /* The bird has to be weightless.  This ugly hack (and the
-                 * corresponding code in the drop function) brought to you
+                 * corresponding code in the carry function) brought to you
                  * by the fact that when the bird is caged, we need to be able
                  * to either 'take bird' or 'take cage' and have the right thing
                  * happen.
@@ -692,7 +699,7 @@ bool tstbit(int mask, int bit)
 }
 
 void set_seed(int32_t seedval)
-/* Set the LCG seed */
+/* Set the LCG1 seed */
 {
     game.lcg_x = seedval % LCG_M;
     if (game.lcg_x < 0) {
@@ -711,6 +718,9 @@ static int32_t get_next_lcg_value(void)
 {
     int32_t old_x = game.lcg_x;
     game.lcg_x = (LCG_A * game.lcg_x + LCG_C) % LCG_M;
+    if (settings.debug) {
+       printf("# random %d\n", old_x); // LCOV_EXCL_LINE
+    }
     return old_x;
 }