X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=e9b5c84e18c083819f1f9bca8ad67e5f9c34e94b;hb=1329da1087dd91d0b4d1a7e0a63f9a669ec57d8c;hp=243381a86330d1df2221b4f3ee6975b8b5cd6b34;hpb=eaee02aa09d1db40ea10d3b77e7df1e2e9c6b9ba;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 243381a..e9b5c84 100644
--- a/misc.c
+++ b/misc.c
@@ -367,7 +367,7 @@ void MOVE(long object, long where)
 	from=game.fixed[object-NOBJECTS];
     else
 	from=game.place[object];
-    if (from > 0 && !SPECIAL(from))
+    if (from != NOWHERE && from != CARRIED && !SPECIAL(from))
 	CARRY(object,from);
     DROP(object,where);
 }
@@ -388,9 +388,9 @@ void CARRY(long object, long where)
     long temp;
 
     if (object <= NOBJECTS) {
-	if (game.place[object] == -1)
+	if (game.place[object] == CARRIED)
 	    return;
-	game.place[object]= -1;
+	game.place[object] = CARRIED;
 	++game.holdng;
     }
     if (game.atloc[where] == object) {
@@ -412,7 +412,7 @@ void DROP(long object, long where)
 	game.fixed[object-NOBJECTS] = where;
     else
     {
-	if (game.place[object] == -1)
+	if (game.place[object] == CARRIED)
 	    --game.holdng;
 	game.place[object] = where;
     }