--- deliantra/server/socket/item.C	2007/10/19 04:25:10	1.54
+++ deliantra/server/socket/item.C	2008/04/22 07:28:05	1.61
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /**
@@ -273,7 +273,7 @@
 
   sl << uint32 (head->count)
      << uint32 (flags)
-     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
+     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
 
   if (!head->custom_name)
@@ -348,7 +348,7 @@
 
   if (QUERY_FLAG (ob, FLAG_REMOVED)
       || !ob->map
-      || ob->map->in_memory != MAP_IN_MEMORY
+      || ob->map->in_memory != MAP_ACTIVE
       || out_of_map (ob->map, ob->x, ob->y))
     return;
 
@@ -508,15 +508,8 @@
 esrv_update_item (int flags, object *pl, object *op)
 {
   /* If we have a request to send the player item, skip a few checks. */
-  if (op != pl)
-    {
-      if (!op->client_visible ())
-        return;
-      /* we remove the check for op->env, because in theory, the object
-       * is hopefully in the same place, so the client should preserve
-       * order.
-       */
-    }
+  if (op != pl && !op->client_visible ())
+    return;
 
   client *ns = pl->contr->ns;
   if (!ns)
@@ -548,12 +541,12 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = WEIGHT (op);
-
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)
@@ -637,7 +630,7 @@
   /* If this is not the player object, do some more checks */
   if (op != pl)
     {
-      /* We only send 'visibile' objects to the client */
+      /* We only send 'visible' objects to the client */
       if (!op->client_visible ())
         return;
 
@@ -667,8 +660,7 @@
 }
 
 /**
- * Tells the client to delete an item.  Uses the item
- * command with a -1 location.
+ * Tells the client to delete an item.
  */
 void
 esrv_del_item (player *pl, int tag)
@@ -802,7 +794,7 @@
 
   if (!op)
     {
-      new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
+      pl->failmsg ("Could not find object to lock/unlock");
       return;
     }
 
@@ -823,12 +815,12 @@
 
   if (!op)
     {
-      new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
+      pl->failmsg ("Could not find object to mark");
       return;
     }
 
   pl->mark = op;
-  new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
+  pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
 }
 
 /**
@@ -925,19 +917,27 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          object *current, *next;
+          int cnt = MAX_ITEM_PER_DROP;
 
-          for (current = op->inv; current != NULL; current = next)
+          for (object *current = op->inv; current; )
             {
-              next = current->below;
+              object *next = current->below;
+
               drop_object (pl, current, 0);
+
+              if (--cnt <= 0) break;
+
+              current = next;
             }
 
-          esrv_update_item (UPD_WEIGHT, pl, op);
+          if (cnt <= 0)
+            op->failmsg ("Only dropped some items, can't drop that many items at once.");
         }
       else
         drop_object (pl, op, nrof);
 
+      update_after_inventory_change (pl);
+
       return;
     }
   else if (to == pl->count)
@@ -964,6 +964,9 @@
    * an make sure env is in fact a container for that matter.
    */
   if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
-    put_object_in_sack (pl, env, op, nrof);
+    {
+      put_object_in_sack (pl, env, op, nrof);
+      update_after_inventory_change (pl);
+    }
 }