Add a useful warning to the tests makefile

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index b2ad68802672a33c6311ddf3d7a68431757a456a..c6733d5fe285f6cc419122c594e93f9f60bea673 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -221,7 +221,7 @@ static char* get_input(void)
     // Print a blank line
     printf("\n");
 
-    char* input = "";
+    char* input;
     for (;;) {
         input = myreadline(input_prompt);
 
@@ -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.