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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.262 by elmex, Wed Oct 22 19:51:41 2008 UTC

   attacked_by    = 0;
   current_weapon = 0;
 }
 void
-object::destroy (bool destroy_inventory)
+object::destroy ()
 {
   if (destroyed ())
     return;
   if (!is_head () && !head->destroyed ())
     {
       LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
-      head->destroy (destroy_inventory);
+      head->destroy ();
       return;
     }
-  destroy_inv (!destroy_inventory);
+  destroy_inv (false);
   if (is_head ())
     if (sound_destroy)
       play_sound (sound_destroy);
     else if (flag [FLAG_MONSTER])
  *   just 'op' otherwise
  */
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
-  if (op->is_on_map ())
-    {
-      LOG (llevError, "insert_ob_in_map called for object already on map");
-      abort ();
-    }
-  if (op->env)
-    {
-      LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
-      op->remove ();
+  op->remove ();
-    }
   if (m == &freed_map)//D TODO: remove soon
     {//D
       LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
     }//D
        * head of the object should correspond for the entire object.
        */
       if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
         continue;
-      if (ob->blocked (m, pos.x, pos.y))
+      if (ob->blocked (pos.m, pos.x, pos.y))
         continue;
       altern [index++] = i;
     }

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