X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=679c2c87505ecfb5f1a451e80988ec7a2394ad66;hp=5386ff786c27c06538d5bb1964f410ff4fcdb596;hb=6d9481130bc122dd1fa0815cb22fe0df38d6e56b;hpb=24d102781c2ec6fef8246b53250dc7590e71fff7

diff --git a/misc.c b/misc.c
index 5386ff7..679c2c8 100644
--- a/misc.c
+++ b/misc.c
@@ -1,3 +1,11 @@
+/*
+ * I/O and support riutines.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+     
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -6,6 +14,7 @@
 #include <sys/time.h>
 #include <ctype.h>
 #include <editline/readline.h>
+#include <inttypes.h>
 
 #include "advent.h"
 #include "dungeon.h"
@@ -66,8 +75,8 @@ static void vspeak(const char* msg, bool blank, va_list ap)
             i++;
             // Integer specifier.
             if (msg[i] == 'd') {
-                long arg = va_arg(ap, long);
-                int ret = snprintf(renderp, size, "%ld", arg);
+                int32_t arg = va_arg(ap, int32_t);
+                int ret = snprintf(renderp, size, "%" PRId32, arg);
                 if (ret < size) {
                     renderp += ret;
                     size -= ret;
@@ -388,22 +397,21 @@ static int get_action_vocab_id(const char* word)
     return (WORD_NOT_FOUND);
 }
 
-static bool is_valid_int(const char *str) 
-/* Returns true if the string passed in is represents a valid integer, 
+static bool is_valid_int(const char *str)
+/* Returns true if the string passed in is represents a valid integer,
  * that could then be parsed by atoi() */
 {
     // Handle negative number
     if (*str == '-')
         ++str;
 
-    // Handle empty string or just "-". Should never reach this 
+    // Handle empty string or just "-". Should never reach this
     // point, because this is only used with transitive verbs.
     if (!*str)
         return false; // LCOV_EXCL_LINE
 
     // Check for non-digit chars in the rest of the stirng.
-    while (*str)
-    {
+    while (*str) {
         if (!isdigit(*str))
             return false;
         else
@@ -577,7 +585,9 @@ void carry(obj_t object, loc_t where)
         if (game.place[object] == CARRIED)
             return;
         game.place[object] = CARRIED;
-        ++game.holdng;
+	
+	if (object!= BIRD)
+	    ++game.holdng;
     }
     if (game.atloc[where] == object) {
         game.atloc[where] = game.link[object];
@@ -598,7 +608,14 @@ void drop(obj_t object, loc_t where)
         game.fixed[object - NOBJECTS] = where;
     else {
         if (game.place[object] == CARRIED)
-            --game.holdng;
+	    if (object != BIRD)
+		/* The bird has to be weightless.  This ugly hack (and the
+		 * corresponding code in the drop 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.
+		 */
+		--game.holdng;
         game.place[object] = where;
     }
     if (where == LOC_NOWHERE ||
@@ -643,11 +660,13 @@ bool tstbit(long mask, int bit)
     return (mask & (1 << bit)) != 0;
 }
 
-void set_seed(long seedval)
+void set_seed(int32_t seedval)
 /* Set the LCG seed */
 {
-    game.lcg_x = (unsigned long) seedval % game.lcg_m;
-
+    game.lcg_x = seedval % LCG_M;
+    if (game.lcg_x < 0) {
+        game.lcg_x = LCG_M + game.lcg_x;
+    }
     // once seed is set, we need to generate the Z`ZZZ word
     for (int i = 0; i < 5; ++i) {
         game.zzword[i] = 'A' + randrange(26);
@@ -656,18 +675,18 @@ void set_seed(long seedval)
     game.zzword[5] = '\0';
 }
 
-static unsigned long get_next_lcg_value(void)
+static int32_t get_next_lcg_value(void)
 /* Return the LCG's current value, and then iterate it. */
 {
-    unsigned long old_x = game.lcg_x;
-    game.lcg_x = (game.lcg_a * game.lcg_x + game.lcg_c) % game.lcg_m;
+    int32_t old_x = game.lcg_x;
+    game.lcg_x = (LCG_A * game.lcg_x + LCG_C) % LCG_M;
     return old_x;
 }
 
-long randrange(long range)
+int32_t randrange(int32_t range)
 /* Return a random integer from [0, range). */
 {
-    return range * get_next_lcg_value() / game.lcg_m;
+    return range * get_next_lcg_value() / LCG_M;
 }
 
 // LCOV_EXCL_START