Fix the mazehint log so it works.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index b4da635737fd93aea06cd5d11c66b0c82a8dde4a..cf75e6442c42452ec02ca6db6ab75bb4a4e23c02 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -337,12 +337,6 @@ long VOCAB(long id, long init)
     BUG(21);
 }
 
-void DSTROY(long object)
-/*  Permanently eliminate "object" by moving to a non-existent location. */
-{
-    MOVE(object,0);
-}
-
 void JUGGLE(long object)
 /*  Juggle an object by picking it up and putting it down again, the purpose
  *  being to get the object to the front of the chain of things at its loc. */
@@ -367,7 +361,7 @@ void MOVE(long object, long where)
        from=game.fixed[object-NOBJECTS];
     else
        from=game.place[object];
-    if (from > NOWHERE && !SPECIAL(from))
+    if (from != NOWHERE && from != CARRIED && !SPECIAL(from))
        CARRY(object,from);
     DROP(object,where);
 }