[ViewVC] Diff of: cvs/deliantra/server/server/time.C

Comparing deliantra/server/server/time.C (file contents):
Revision 1.80 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.81 by root, Mon Sep 29 10:31:32 2008 UTC

       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy_inv (true); // be explicit about dropping
+  op->drop_and_destroy ();
-  op->destroy (true);
 }
 void
 remove_door2 (object *op)
 {
       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy_inv (true); // be explicit about dropping
+  op->drop_and_destroy ();
-  op->destroy (true);
 }
 void
 generate_monster (object *gen)
 {
     {
       creator->stats.hp = -1;
       return;
     }
-  if (creator->inv != NULL)
+  if (creator->inv)
     {
       object *ob;
       int i;
       object *ob_to_copy;
     }
   /* Make sure this multipart object fits */
   if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
     {
-      op->destroy_inv (false); // remove when desttroy does this
-      new_ob->destroy (true);
+      new_ob->destroy ();
       return;
     }
   // for now lets try to identify everything generated here, it mostly
   // happens automated, so this will at least fix many identify-experience holes
               op->remove (); // TODO: really necessary?
               if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
                 make_sure_not_seen (op);
-              op->destroy_inv (false); // be explicit about dropping
-              op->destroy (true);
+              op->drop_and_destroy ();
             }
           return;
         }
     }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines