--- deliantra/server/socket/item.C	2009/10/19 21:48:49	1.80
+++ deliantra/server/socket/item.C	2010/04/03 02:27:24	1.89
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -50,7 +50,7 @@
  *  This is a similar to query_name, but returns flags
  *  to be sent to client. 
  */
-unsigned int
+static unsigned int
 query_flags (object *op)
 {
   unsigned int flags = 0;
@@ -116,10 +116,8 @@
 static void
 add_object_to_socklist (client &ns, packet &sl, object *head)
 {
-  char item_n[MAX_BUF];
-  const char *item_p;
-
   int flags = query_flags (head);
+
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
 
@@ -134,33 +132,32 @@
      << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
 
-  int len;
-
   if (!head->custom_name)
     {
-      strncpy (item_n, query_base_name (head, 0), 127);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = query_base_name (head, 1);
+      const char *name;
+      uint8 *len = sl.cur++; // patch up length later
+
+      name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
+      sl << uint8 (0);
+      name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
+
+      *len = sl.cur - len - 1;
     }
   else
     {
-      strncpy (item_n, head->custom_name, 127);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = head->custom_name;
-    }
+      int len = min (head->custom_name.length (), 127);
 
-  strncpy (item_n + len + 1, item_p, 127);
-  item_n[254] = 0;
-  len += strlen (item_n + 1 + len) + 1;
+      sl << uint8 (len * 2 + 1)
+         << data (head->custom_name, len)
+         << uint8 (0)
+         << data (head->custom_name, len);
+    }
 
-  sl << data8 (item_n, len)
-     << uint16 (head->animation_id);
+  sl << uint16 (head->animation_id);
 
   int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
                  : head->anim_speed           ? clamp (head->anim_speed, 1, 255)
-                 :                              1. / clamp (fabs (head->speed), 1./255., 1./1.);
+                 :                              1. / clamp (head->speed, 1./255., 1./1.);
 
   sl << uint8  (anim_speed)
      << uint32 (head->nrof);
@@ -452,12 +449,12 @@
             anim_speed = op->anim_speed;
           else
             {
-              if (fabs (op->speed) < 0.001)
+              if (op->speed < 0.001)
                 anim_speed = 255;
-              else if (fabs (op->speed) >= 1.0)
+              else if (op->speed >= 1.0)
                 anim_speed = 1;
               else
-                anim_speed = (int) (1.0 / fabs (op->speed));
+                anim_speed = 1. / op->speed;
             }
 
           if (anim_speed > 255)
@@ -526,7 +523,7 @@
  * Takes a player and object count (tag) and returns the actual object
  * pointer, or null if it can't be found.
  */
-object *
+static object *
 esrv_get_ob_from_count (object *pl, tag_t count)
 {
   if (pl->count == count)
@@ -624,7 +621,7 @@
       return;
     }
 
-  player_apply (pl->ob, op, 0, 0);
+  pl->ob->apply (op);
 }
 
 /** Client wants to lock some object. Lets do so. */
@@ -694,10 +691,10 @@
           ms.update ();
 
           buf.printf (" map: %s%+d%+d (%+d%+d)\n"
-                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
+                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
                       &pos.m->path, pos.x, pos.y, dx, dy,
                       (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
-                      ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
+                      ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
                      );
         }
       else
@@ -719,7 +716,7 @@
               continue;
 
             if (wiz)
-              buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
+              buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
             else
               buf.printf (" - %s.\n", query_name (tmp));
 
@@ -777,7 +774,7 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          int cnt = MAX_ITEM_PER_DROP;
+          int cnt = MAX_ITEM_PER_ACTION;
 
           for (object *current = op->inv; current && cnt--; )
             {