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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.222 by root, Wed Apr 30 05:06:36 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;
 }
  * 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");
   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
 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] = 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] = 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.219 by root, Wed Apr 23 21:09:10 2008 UTC vs. Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC