X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=cf75e6442c42452ec02ca6db6ab75bb4a4e23c02;hb=3939cd4f963b485e1da42787f59fdbcfae23be19;hp=b4da635737fd93aea06cd5d11c66b0c82a8dde4a;hpb=a57d93ce35ccdea6fa4f260bf004d6f8f9924b2f;p=open-adventure.git diff --git a/misc.c b/misc.c index b4da635..cf75e64 100644 --- 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); }