X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=0bcfb26387b7edb2487d636c2991ca40c6fabc93;hb=71f05c456766111b31c13a78420d2f0bb9b95416;hp=7365fbf1a7bb3f0b04eb79587cbb2558a7b2ea40;hpb=b8c7a6d5ea9e568631cc84e04bf0d8861b6f99ec;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 7365fbf..0bcfb26 100644
--- a/misc.c
+++ b/misc.c
@@ -1,5 +1,5 @@
 /*
- * I/O and support riutines.
+ * I/O and support routines.
  *
  * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
  * Copyright (c) 2017 by Eric S. Raymond
@@ -411,7 +411,7 @@ static bool is_valid_int(const char *str)
     if (!*str)
         return false; // LCOV_EXCL_LINE
 
-    // Check for non-digit chars in the rest of the stirng.
+    // Check for non-digit chars in the rest of the string.
     while (*str) {
         if (!isdigit(*str))
             return false;
@@ -476,7 +476,7 @@ static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type)
 static void tokenize(char* raw, command_t *cmd)
 {
     /*
-     * Be caereful about modifing this. We do not want to nuke the
+     * Be careful about modifying this. We do not want to nuke the
      * the speech part or ID from the previous turn.
      */
     memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0].raw));
@@ -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;;
 }
 
 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.