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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.215 by root, Tue Apr 22 07:28:05 2008 UTC vs.
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC

 // find player who can see this object
 object *
 object::visible_to () const
 {
-  if (!flag [FLAG_REMOVED])
+  if (client_visible () && !flag [FLAG_REMOVED])
     {
       // see if we are in a container of sorts
       if (env)
         {
           // the player inventory itself is always visible
       else
         {
           // maybe there is a player standing on the same mapspace
           // this will catch the case where "this" is a player
           if (object *pl = ms ().player ())
+            if (!pl->container || this == pl->container)
-            return pl;
+              return pl;
         }
     }
   return 0;
 }
     }
   op->key_values = 0;
 }
-object &
+/*
-object::operator =(const object &src)
+ * copy_to first frees everything allocated by the dst object,
+ * and then copies the contents of itself into the second
+ * object, allocating what needs to be allocated.  Basically, any
+ * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
+ * if the first object is freed, the pointers in the new object
+ * will point at garbage.
+ */
+void
+object::copy_to (object *dst)
 {
-  bool is_freed   = flag [FLAG_FREED];
+  dst->remove ();
-  bool is_removed = flag [FLAG_REMOVED];
-  *(object_copy *)this = src;
+  *(object_copy *)dst = *this;
-  flag [FLAG_FREED]   = is_freed;
-  flag [FLAG_REMOVED] = is_removed;
+  dst->flag [FLAG_REMOVED] = true;
   /* Copy over key_values, if any. */
-  if (src.key_values)
+  if (key_values)
     {
       key_value *tail = 0;
-      key_values = 0;
+      dst->key_values = 0;
-      for (key_value *i = src.key_values; i; i = i->next)
+      for (key_value *i = key_values; i; i = i->next)
         {
           key_value *new_link = new key_value;
-          new_link->next = 0;
+          new_link->next  = 0;
-          new_link->key = i->key;
+          new_link->key   = i->key;
           new_link->value = i->value;
           /* Try and be clever here, too. */
-          if (!key_values)
+          if (!dst->key_values)
             {
-              key_values = new_link;
+              dst->key_values = new_link;
               tail = new_link;
             }
           else
             {
               tail->next = new_link;
               tail = new_link;
             }
         }
     }
-}
-/*
- * copy_to first frees everything allocated by the dst object,
- * and then copies the contents of itself into the second
- * object, allocating what needs to be allocated.  Basically, any
- * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
- * if the first object is freed, the pointers in the new object
- * will point at garbage.
- */
-void
-object::copy_to (object *dst)
-{
-  *dst = *this;
   if (speed < 0)
     dst->speed_left -= rndm ();
   dst->set_speed (dst->speed);
 object *
 object::clone ()
 {
   object *neu = create ();
   copy_to (neu);
+  neu->map = map; // not copied by copy_to
   return neu;
 }
 /*
  * If an object with the IS_TURNABLE() flag needs to be turned due
  * UP_OBJ_FACE: only the objects face has changed.
  */
 void
 update_object (object *op, int action)
 {
-  if (op == NULL)
+  if (!op)
     {
       /* this should never happen */
-      LOG (llevDebug, "update_object() called for NULL object.\n");
+      LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
       return;
     }
-  if (op->env)
+  if (!op->is_on_map ())
     {
       /* Animation is currently handled by client, so nothing
        * to do in this case.
        */
       return;
     }
-  /* If the map is saving, don't do anything as everything is
-   * going to get freed anyways.
-   */
-  if (!op->map || op->map->in_memory == MAP_SAVING)
-    return;
   /* make sure the object is within map boundaries */
   if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
     {
       LOG (llevError, "update_object() called for object out of map!\n");
 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,
+  // corollary: if you create arrows etc. with stuff in its inventory,
   // cf will crash below with off-map x and y
   if (!inv)
     return;
   /* Only if the space blocks everything do we not process -
       || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         {
-          inv->destroy_inv (drop_to_ground);
+          inv->destroy_inv (false);
           inv->destroy ();
         }
     }
   else
     {                       /* Put objects in inventory onto this space */
               || op->flag [FLAG_NO_DROP]
               || op->type == RUNE
               || op->type == TRAP
               || op->flag [FLAG_IS_A_TEMPLATE]
               || op->flag [FLAG_DESTROY_ON_DEATH])
-            op->destroy ();
+            op->destroy (true);
           else
             map->insert (op, x, y);
         }
     }
 }
   object *op = new object;
   op->link ();
   return op;
 }
+static struct freed_map : maptile
+{
+  freed_map ()
+  {
+    path   = "<freed objects map>";
+    name   = "/internal/freed_objects_map";
+    width  = 3;
+    height = 3;
+    nodrop = 1;
+    alloc ();
+    in_memory = MAP_ACTIVE;
+  }
+} freed_map; // freed objects are moved here to avoid crashes
 void
 object::do_destroy ()
 {
   if (flag [FLAG_IS_LINKED])
     remove_button_link (this);
   remove ();
   attachable::do_destroy ();
-  destroy_inv (true);
   deactivate ();
   unlink ();
   flag [FLAG_FREED] = 1;
   // 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->path   = "<freed objects map>";
-        freed_map->name   = "/internal/freed_objects_map";
-        freed_map->width  = 3;
-        freed_map->height = 3;
-        freed_map->nodrop = 1;
-        freed_map->alloc ();
-        freed_map->in_memory = MAP_ACTIVE;
-      }
-    map = freed_map;
+  map = &freed_map;
-    x = 1;
+  x = 1;
-    y = 1;
+  y = 1;
-  }
   if (more)
     {
       more->destroy ();
       more = 0;
 object::destroy (bool destroy_inventory)
 {
   if (destroyed ())
     return;
+  if (!is_head () && !head->destroyed ())
+    {
+      LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
+      head->destroy (destroy_inventory);
+      return;
+    }
-  if (destroy_inventory)
+  destroy_inv (!destroy_inventory);
-    destroy_inv (false);
   if (is_head ())
     if (sound_destroy)
       play_sound (sound_destroy);
     else if (flag [FLAG_MONSTER])
   if (flag [FLAG_REMOVED])
     return;
   INVOKE_OBJECT (REMOVE, this);
-  if (object *pl = visible_to ())
-    esrv_del_item (pl->contr, count);
   flag [FLAG_REMOVED] = true;
   if (more)
     more->remove ();
    * In this case, the object to be removed is in someones
    * inventory.
    */
   if (env)
     {
+      flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
+      if (object *pl = visible_to ())
+        esrv_del_item (pl->contr, count);
+      flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
       adjust_weight (env, -total_weight ());
       *(above ? &above->below : &env->inv) = below;
       if (below)
       if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
         otmp->update_stats ();
     }
   else if (map)
     {
-      if (type == PLAYER)
-        {
-          // leaving a spot always closes any open container on the ground
-          if (container && !container->env)
-            // this causes spurious floorbox updates, but it ensures
-            // that the CLOSE event is being sent.
-            close_container ();
-          --map->players;
-          map->touch ();
-        }
       map->dirty = true;
       mapspace &ms = this->ms ();
+      if (object *pl = ms.player ())
+        {
+          if (type == PLAYER) // this == pl(!)
+            {
+              // leaving a spot always closes any open container on the ground
+              if (container && !container->env)
+                // this causes spurious floorbox updates, but it ensures
+                // that the CLOSE event is being sent.
+                close_container ();
+              --map->players;
+              map->touch ();
+            }
+          else if (pl->container == this)
+            {
+              // removing a container should close it
+              close_container ();
+            }
+          esrv_del_item (pl->contr, count);
+        }
       /* link the object above us */
       if (above)
         above->below = below;
       else
              * removed (most likely destroyed), update the player view
              * appropriately.
              */
             pl->close_container ();
+          //TODO: the floorbox prev/next might need updating
+          //esrv_del_item (pl->contr, count);
+          //TODO: update floorbox to preserve ordering
+          if (pl->contr->ns)
-          pl->contr->ns->floorbox_update ();
+            pl->contr->ns->floorbox_update ();
         }
       for (tmp = ms.bot; tmp; tmp = tmp->above)
         {
           /* No point updating the players look faces if he is the object
 object *
 insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
 {
   assert (!op->flag [FLAG_FREED]);
-  object *top, *floor = NULL;
   op->remove ();
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
    */
   if (!xy_normalise (m, op->x, op->y))
     {
-      op->destroy ();
+      op->destroy (1);
       return 0;
     }
   if (object *more = op->more)
     if (!insert_ob_in_map (more, m, originator, flag))
    */
   if (op->nrof && !(flag & INS_NO_MERGE))
     for (object *tmp = ms.bot; tmp; tmp = tmp->above)
       if (object::can_merge (op, tmp))
         {
+          // TODO: we atcually want to update tmp, not op,
+          // but some caller surely breaks when we return tmp
+          // from here :/
           op->nrof += tmp->nrof;
           tmp->destroy (1);
         }
   CLEAR_FLAG (op, FLAG_APPLIED);        /* hack for fixing F_APPLIED in items of dead people */
       /* since *below* originator, no need to update top */
       originator->below = op;
     }
   else
     {
+      object *top, *floor = NULL;
       top = ms.bot;
       /* If there are other objects, then */
       if (top)
         {
     }
   op->map->dirty = true;
   if (object *pl = ms.player ())
+    //TODO: the floorbox prev/next might need updating
+    //esrv_send_item (pl, op);
+    //TODO: update floorbox to preserve ordering
+    if (pl->contr->ns)
-    pl->contr->ns->floorbox_update ();
+      pl->contr->ns->floorbox_update ();
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really
    * an inefficient way to do this, as it means los for all players
    * on the map will get recalculated.  The players could very well
  * create clone from object to another
  */
 object *
 object_create_clone (object *asrc)
 {
-  object *dst = 0, *tmp, *src, *prev, *item;
+  object *dst = 0;
   if (!asrc)
     return 0;
-  src = asrc->head_ ();
+  object *src = asrc->head_ ();
-  prev = 0;
+  object *prev = 0;
   for (object *part = src; part; part = part->more)
     {
-      tmp = part->clone ();
+      object *tmp = part->clone ();
       tmp->x -= src->x;
       tmp->y -= src->y;
       if (!part->head)
         {
         prev->more = tmp;
       prev = tmp;
     }
-  for (item = src->inv; item; item = item->below)
+  for (object *item = src->inv; item; item = item->below)
     insert_ob_in_ob (object_create_clone (item), dst);
   return dst;
 }
                  &name,
                  title ? "\",title:\"" : "",
                  title ? (const char *)title : "",
                  flag_desc (flagdesc, 512), type);
-  if (!this->flag[FLAG_REMOVED] && env)
+  if (!flag[FLAG_REMOVED] && env)
     p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
   if (map)
     p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
 object::open_container (object *new_container)
 {
   if (container == new_container)
     return;
-  if (object *old_container = container)
+  object *old_container = container;
+  if (old_container)
     {
       if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
         return;
 #if 0
       if (object *closer = old_container->inv)
         if (closer->type == CLOSE_CON)
           closer->destroy ();
 #endif
+      // make sure the container is available
+      esrv_send_item (this, old_container);
-      old_container->flag [FLAG_APPLIED] = 0;
+      old_container->flag [FLAG_APPLIED] = false;
       container = 0;
+      // client needs item update to make it work, client bug requires this to be separate
       esrv_update_item (UPD_FLAGS, this, old_container);
       new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
       play_sound (sound_find ("chest_close"));
     }
   if (new_container)
         }
 #endif
       new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+      // make sure the container is available, client bug requires this to be separate
+      esrv_send_item (this, new_container);
-      new_container->flag [FLAG_APPLIED] = 1;
+      new_container->flag [FLAG_APPLIED] = true;
       container = new_container;
+      // client needs flag change
       esrv_update_item (UPD_FLAGS, this, new_container);
       esrv_send_inventory (this, new_container);
       play_sound (sound_find ("chest_open"));
     }
+//  else if (!old_container->env && contr && contr->ns)
+//    contr->ns->floorbox_reset ();
 }
 object *
 object::force_find (const shstr name)
 {

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.215 by root, Tue Apr 22 07:28:05 2008 UTC vs. Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.215 by root, Tue Apr 22 07:28:05 2008 UTC vs.
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC