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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC

   prev = 0;
   next = 0;
 }
-object *object::create ()
-{
-  object *op = new object;
-  op->link ();
-  return op;
-}
-void
-object::do_destroy ()
-{
-  attachable::do_destroy ();
-  if (flag [FLAG_IS_LINKED])
-    remove_button_link (this);
-  if (flag [FLAG_FRIENDLY])
-    remove_friendly_object (this);
-  if (!flag [FLAG_REMOVED])
-    remove ();
-  if (flag [FLAG_FREED])
-    return;
-  flag [FLAG_FREED] = 1;
-  while (inv)
-    inv->destroy ();
-  set_speed (0);
-  unlink ();
-  // hack to ensure that freed objects still have a valid map
-  {
-    static maptile *freed_map; // freed objects are moved here to avoid crashes
-    if (!freed_map)
-      {
-        freed_map = new maptile;
-        freed_map->name   = "/internal/freed_objects_map";
-        freed_map->width  = 3;
-        freed_map->height = 3;
-        freed_map->allocate ();
-      }
-    map = freed_map;
-    x = 1;
-    y = 1;
-  }
-  head = 0;
-  if (more)
-    {
-      more->destroy ();
-      more = 0;
-    }
-  // clear those pointers that likely might have circular references to us
-  owner       = 0;
-  enemy       = 0;
-  attacked_by = 0;
-  // only relevant for players(?), but make sure of it anyways
-  contr       = 0;
-}
 /*
  * Remove and free all objects in the inventory of the given object.
  * object.c ?
  */
 void
 object::destroy_inv (bool drop_to_ground)
 {
+  // need to check first, because the checks below might segfault
+  // as we might be on an invalid mapspace and crossfire code
+  // is too buggy to ensure that the inventory is empty.
+  // corollary: if you create arrows etc. with stuff in tis inventory,
+  // cf will crash below with off-map x and y
+  if (!inv)
+    return;
   /* Only if the space blocks everything do we not process -
    * if some form of movement is allowed, let objects
    * drop on that space.
    */
-  if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
+  if (!drop_to_ground
+      || !map
+      || map->in_memory != MAP_IN_MEMORY
+      || ms ().move_block == MOVE_ALL)
     {
       while (inv)
+        {
+          inv->destroy_inv (drop_to_ground);
-        inv->destroy ();
+          inv->destroy ();
+        }
     }
   else
     {                       /* Put objects in inventory onto this space */
       while (inv)
         {
               || op->type == RUNE
               || op->type == TRAP
               || op->flag [FLAG_IS_A_TEMPLATE])
             op->destroy ();
           else
-            {
+            map->insert (op, x, y);
-              op->remove ();
-              op->x = x;
-              op->y = y;
-              insert_ob_in_map (op, map, 0, 0);     /* Insert in same map as the envir */
-            }
         }
     }
+}
+object *object::create ()
+{
+  object *op = new object;
+  op->link ();
+  return op;
+}
+void
+object::do_destroy ()
+{
+  if (flag [FLAG_IS_LINKED])
+    remove_button_link (this);
+  if (flag [FLAG_FRIENDLY])
+    remove_friendly_object (this);
+  if (!flag [FLAG_REMOVED])
+    remove ();
+  if (flag [FLAG_FREED])
+    return;
+  set_speed (0);
+  flag [FLAG_FREED] = 1;
+  attachable::do_destroy ();
+  destroy_inv (true);
+  unlink ();
+  // hack to ensure that freed objects still have a valid map
+  {
+    static maptile *freed_map; // freed objects are moved here to avoid crashes
+    if (!freed_map)
+      {
+        freed_map = new maptile;
+        freed_map->name   = "/internal/freed_objects_map";
+        freed_map->width  = 3;
+        freed_map->height = 3;
+        freed_map->allocate ();
+      }
+    map = freed_map;
+    x = 1;
+    y = 1;
+  }
+  head = 0;
+  if (more)
+    {
+      more->destroy ();
+      more = 0;
+    }
+  // clear those pointers that likely might have circular references to us
+  owner       = 0;
+  enemy       = 0;
+  attacked_by = 0;
+  // only relevant for players(?), but make sure of it anyways
+  contr       = 0;
 }
 void
 object::destroy (bool destroy_inventory)
 {
   if (destroyed ())
     return;
   if (destroy_inventory)
-    destroy_inv (true);
+    destroy_inv (false);
   attachable::destroy ();
 }
 /*
       if (map->in_memory == MAP_SAVING)
         return;
       int check_walk_off = !flag [FLAG_NO_APPLY];
-      for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
+      for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
            * being removed.
            */
  * job preparing multi-part monsters
  */
 object *
 insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
 {
-  object *tmp;
-  if (op->head)
-    op = op->head;
-  for (tmp = op; tmp; tmp = tmp->more)
+  for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
     {
       tmp->x = x + tmp->arch->clone.x;
       tmp->y = y + tmp->arch->clone.y;
     }
   tmp1->x = op->x;
   tmp1->y = op->y;
   insert_ob_in_map (tmp1, op->map, op, 0);
 }
+object *
+object::insert_at (object *where, object *originator, int flags)
+{
+  where->map->insert (this, where->x, where->y, originator, flags);
+}
 /*
  * get_split_ob(ob,nr) splits up ob into two parts.  The part which
  * is returned contains nr objects, and the remaining parts contains
  * the rest (or is removed and freed if that number is 0).
  * On failure, NULL is returned, and the reason put into the
  * global static errmsg array.
  */
 object *
 get_split_ob (object *orig_ob, uint32 nr)
 {
   object *newob;
   int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
  *
  * MSW 2001-07-08: Check all objects on space, not just those below
  * object being inserted.  insert_ob_in_map may not put new objects
  * on top.
  */
 int
 check_move_on (object *op, object *originator)
 {
   object *tmp;
   maptile *m = op->map;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs. Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC