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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC

   /* Everything passes, must be OK. */
   return 1;
 }
+// find player who can see this object
+object *
+object::visible_to () const
+{
+  if (!flag [FLAG_REMOVED])
+    {
+      // see if we are in a container of sorts
+      if (env)
+        {
+          // the player inventory itself is always visible
+          if (env->type == PLAYER)
+            return env;
+          // else a player could have our env open
+          object *envest = env->outer_env ();
+          // the player itself is always on a map, so we will find him here
+          // even if our inv is in a player.
+          if (envest->is_on_map ())
+            if (object *pl = envest->ms ().player ())
+              if (pl->container == env)
+                return pl;
+        }
+      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 ())
+            return pl;
+        }
+    }
+  return 0;
+}
 // adjust weight per container type ("of holding")
 static sint32
 weight_adjust (object *op, sint32 weight)
 {
   return op->type == CONTAINER
         return;
       op->carrying += weight;
       if (object *pl = op->visible_to ())
+        if (pl != op) // player is handled lazily
-        esrv_update_item (UPD_WEIGHT, pl, op);
+          esrv_update_item (UPD_WEIGHT, pl, op);
       op = op->env;
     }
 }
   if (sum != carrying)
     {
       carrying = sum;
       if (object *pl = visible_to ())
+        if (pl != this) // player is handled lazily
-        esrv_update_item (UPD_WEIGHT, pl, this);
+          esrv_update_item (UPD_WEIGHT, pl, this);
     }
 }
 /*
  * Used by: Server DM commands: dumpbelow, dump. Some error messages.
 }
 void
 object::do_destroy ()
 {
-  if (object *pl = visible_to ())
-    esrv_del_item (pl->contr, count);
-  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 ();
+  remove ();
+  attachable::do_destroy ();
   destroy_inv (true);
   deactivate ();
   unlink ();
 object::do_remove ()
 {
   object *tmp, *last = 0;
   object *otmp;
-  if (QUERY_FLAG (this, FLAG_REMOVED))
+  if (flag [FLAG_REMOVED])
     return;
-  SET_FLAG (this, FLAG_REMOVED);
   INVOKE_OBJECT (REMOVE, this);
+  if (object *pl = visible_to ())
+    esrv_del_item (pl->contr, count);
+  flag [FLAG_REMOVED] = true;
   if (more)
     more->remove ();
   /*
   if (!top)
     for (top = op; top && top->above; top = top->above)
       ;
   for (; top; top = top->below)
-    {
-      if (top == op)
-        continue;
-      if (object::can_merge (op, top))
+    if (object::can_merge (op, top))
-        {
+      {
-          top->nrof += op->nrof;
+        top->nrof += op->nrof;
-/*      CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
+        if (object *pl = top->visible_to ())
-          op->weight = 0;       /* Don't want any adjustements now */
+          esrv_update_item (UPD_NROF, pl, top);
+        op->weight   = 0; // cancel the addition above
+        op->carrying = 0; // must be 0 already
-          op->destroy ();
+        op->destroy (1);
-          return top;
+        return top;
-        }
+      }
-    }
   return 0;
 }
 void
     return where->env->insert (this);
   else
     return where->map->insert (this, where->x, where->y, originator, flags);
 }
-// find player who can see this object
-object *
-object::visible_to () const
-{
-  if (!flag [FLAG_REMOVED])
-    {
-      // see if we are in a container of sorts
-      if (env)
-        {
-          // the player inventory itself is always visible
-          if (env->type == PLAYER)
-            return env;
-          // else a player could have our env open
-          object *envest = env->outer_env ();
-          // the player itself is always on a map, so we will find him here
-          // even if our inv is in a player.
-          if (envest->is_on_map ())
-            if (object *pl = envest->ms ().player ())
-              if (pl->container == env)
-                return pl;
-        }
-      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 ())
-            return pl;
-        }
-    }
-  return 0;
-}
 /*
  * decrease(object, number) decreases a specified number from
  * the amount of an object. If the amount reaches 0, the object
  * is subsequently removed and freed.
  *
       if (object::can_merge (tmp, op))
         {
           /* return the original object and remove inserted object
              (client needs the original object) */
           tmp->nrof += op->nrof;
+          if (object *pl = tmp->visible_to ())
+            esrv_update_item (UPD_NROF, pl, tmp);
           adjust_weight (this, op->total_weight ());
           op->destroy (1);
           op = tmp;
           goto inserted;
   inv = op;
   op->flag [FLAG_REMOVED] = 0;
+  if (object *pl = op->visible_to ())
+    esrv_send_item (pl, op);
   adjust_weight (this, op->total_weight ());
 inserted:
   /* reset the light list and los of the players on the map */
   if (op->glow_radius && map && map->darkness)
     update_all_los (map, x, y);
-  if (object *otmp = in_player ())
+  // if this is a player's inventory, update stats
-    if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+  if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
-      otmp->update_stats ();
+    update_stats ();
   INVOKE_OBJECT (INSERT, this);
   return op;
 }
       if (object *closer = old_container->inv)
         if (closer->type == CLOSE_CON)
           closer->destroy ();
 #endif
-      old_container->flag [FLAG_APPLIED] = 0;
+      old_container->flag [FLAG_APPLIED] = false;
       container = 0;
       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"));
         }
 #endif
       new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
-      new_container->flag [FLAG_APPLIED] = 1;
+      new_container->flag [FLAG_APPLIED] = true;
       container = new_container;
       esrv_update_item (UPD_FLAGS, this, new_container);
       esrv_send_inventory (this, new_container);
       play_sound (sound_find ("chest_open"));

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs. Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC