--- deliantra/server/server/attack.C	2008/07/14 18:36:43	1.87
+++ deliantra/server/server/attack.C	2008/07/16 14:29:40	1.88
@@ -150,7 +150,7 @@
       maptile *m = op->map;
 
       op = stop_item (op);
-      if (op == NULL)
+      if (!op)
         return;
 
       /* Hacked the following so that type LIGHTER will work. 
@@ -194,9 +194,7 @@
       else
         {
           // drop everything to the ground, if possible
-          while (op->inv)
-            op->inv->insert_at (originator);
-
+          op->insert_at (originator);
           op->destroy ();
         }
 
@@ -214,7 +212,7 @@
     }
 
   /* The value of 50 is arbitrary. */
-  if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
+  if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
     {
       archetype *at = archetype::find (shstr_icecube);