--- deliantra/server/common/object.C	2009/11/06 13:03:34	1.295
+++ deliantra/server/common/object.C	2009/11/29 10:55:18	1.307
@@ -79,7 +79,7 @@
 }
 
 static void
-read_uuid (void)
+read_uuid ()
 {
   char filename[MAX_BUF];
 
@@ -103,7 +103,7 @@
       _exit (1);
     }
 
-  UUID::BUF buf;
+  char buf [UUID::MAX_LEN];
   buf[0] = 0;
   fgets (buf, sizeof (buf), fp);
 
@@ -142,6 +142,71 @@
   read_uuid ();
 }
 
+bool
+UUID::parse (const char *s)
+{
+  if (*s++ != '<' || *s++ != '1' || *s++ != '.')
+    return false;
+
+  seq = 0;
+
+  while (*s != '>')
+    {
+      if (*s < '0')
+        return false;
+
+      // this gives nice branchless code with gcc
+      assert ('0' < 'a' && '0' == 48 && 'a' == 97);
+      int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
+
+      seq = (seq << 4) | digit;
+
+      ++s;
+    }
+
+  return true;
+}
+
+char *
+UUID::append (char *buf) const
+{
+  *buf++ = '<';
+  *buf++ = '1';
+  *buf++ = '.';
+
+  uint64_t seq = this->seq;
+  const int bits = 64;
+  char nz = 0;
+  static const char tohex [] = "0123456789abcdef";
+
+  // assert (len >= 3 + bits / 4 + 1 + 1);
+  for (int i = bits / 4; --i; )
+    {
+      uint8_t digit = seq >> (bits - 4);
+
+      *buf = tohex [digit];
+      nz |= digit;
+      buf += nz ? 1 : 0;
+      seq <<= 4;
+    }
+
+  // last digit is special - always emit
+  uint8_t digit = seq >> (bits - 4);
+  *buf++ = tohex [digit];
+
+  *buf++ = '>';
+
+  return buf;
+}
+
+char *
+UUID::c_str () const
+{
+  static char buf [MAX_LEN];
+  *append (buf) = 0;
+  return buf;
+}
+
 /* Returns TRUE if every key_values in wants has a partner with the same value in has. */
 static bool
 compare_ob_value_lists_one (const object *wants, const object *has)
@@ -188,7 +253,7 @@
   /* A couple quicksanity checks */
   if (ob1 == ob2
       || ob1->type  != ob2->type
-      || ob1->speed != ob2->speed
+      || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
       || ob1->value != ob2->value
       || ob1->name  != ob2->name)
     return 0;
@@ -223,7 +288,7 @@
       || ob1->animation_id != ob2->animation_id
       || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
       || ob1->client_type  != ob2->client_type
-      || ob1->materialname != ob2->materialname
+      || ob1->material     != ob2->material
       || ob1->lore         != ob2->lore
       || ob1->subtype      != ob2->subtype
       || ob1->move_type    != ob2->move_type
@@ -232,7 +297,7 @@
       || ob1->move_on      != ob2->move_on
       || ob1->move_off     != ob2->move_off
       || ob1->move_slow    != ob2->move_slow
-      || ob1->move_slow_penalty != ob2->move_slow_penalty
+      || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
       || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
       || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
     return 0;
@@ -444,29 +509,6 @@
 }
 
 /*
- * get_nearest_part(multi-object, object 2) returns the part of the
- * multi-object 1 which is closest to the second object.
- * If it's not a multi-object, it is returned.
- */
-static object *
-get_nearest_part (object *op, const object *pl)
-{
-  object *tmp, *closest;
-  int last_dist, i;
-
-  if (!op->more)
-    return op;
-
-  for (last_dist = distance (op, pl), closest = op, tmp = op->more;
-       tmp;
-       tmp = tmp->more)
-    if ((i = distance (tmp, pl)) < last_dist)
-      closest = tmp, last_dist = i;
-
-  return closest;
-}
-
-/*
  * Returns the object which has the count-variable equal to the argument.
  * VERRRY slow.
  */
@@ -647,9 +689,6 @@
         }
     }
 
-  if (speed < 0)
-    dst->speed_left -= rndm ();
-
   dst->activate ();
 }
 
@@ -659,7 +698,12 @@
   if (!uuid.seq) // HACK
     uuid = UUID::gen ();
 
-  speed_left = -0.1f;
+  // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+  if (flag [FLAG_RANDOM_SPEED] && speed)
+    speed_left = -rndm (); // TODO animation
+  else
+    speed_left = -speed;
+
   /* copy the body_info to the body_used - this is only really
    * need for monsters, but doesn't hurt to do it for everything.
    * by doing so, when a monster is created, it has good starting
@@ -677,6 +721,11 @@
 {
   object *neu = create ();
   copy_to (neu);
+
+  // TODO: unclean state changes, should not be done in clone AND instantiate
+  if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
+    neu->speed_left = -rndm (); // TODO animation
+
   neu->map = map; // not copied by copy_to
   return neu;
 }
@@ -704,12 +753,6 @@
 void
 object::set_speed (float speed)
 {
-  if (flag [FLAG_FREED] && speed)
-    {
-      LOG (llevError, "Object %s is freed but has speed.\n", &name);
-      speed = 0;
-    }
-
   this->speed = speed;
 
   if (has_active_speed ())
@@ -769,6 +812,7 @@
     /* nop */;
   else if (action == UP_OBJ_INSERT)
     {
+#if 0
       // this is likely overkill, TODO: revisit (schmorp)
       if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW)  && !(m.flags_ & P_BLOCKSVIEW))
           || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
@@ -783,8 +827,11 @@
            * have move_allow right now.    
            */
           || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
-          || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
         m.invalidate ();
+#else
+      // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
+      m.invalidate ();
+#endif
     }
     /* if the object is being removed, we can't make intelligent
      * decisions, because remove_ob can't really pass the object
@@ -806,7 +853,8 @@
   SET_FLAG (this, FLAG_REMOVED);
 
   //expmul = 1.0; declared const for the time being
-  face = blank_face;
+  face     = blank_face;
+  material = MATERIAL_NULL;
 }
 
 object::~object ()
@@ -1087,18 +1135,13 @@
       below = 0;
       env   = 0;
 
-      /* NO_FIX_PLAYER is set when a great many changes are being
-       * made to players inventory.  If set, avoiding the call
-       * to save cpu time.
-       */
-      if (pl)
-        if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
-          {
-            pl->update_stats ();
+      if (pl && pl->is_player ())
+        {
+          pl->contr->queue_stats_update ();
 
-            if (glow_radius && pl->is_on_map ())
-              update_all_los (pl->map, pl->x, pl->y);
-          }
+          if (glow_radius && pl->is_on_map ())
+            update_all_los (pl->map, pl->x, pl->y);
+        }
     }
   else if (map)
     {
@@ -1530,6 +1573,28 @@
     return where->map->insert (this, where->x, where->y, originator, flags);
 }
 
+// check whether we can put this into the map, respect max_volume, max_items
+bool
+object::can_drop_at (maptile *m, int x, int y, object *originator)
+{
+  mapspace &ms = m->at (x, y);
+
+  int items = ms.items ();
+
+  if (!items // testing !items ensures we can drop at least one item
+      || (items < m->max_items
+          && ms.volume () < m->max_volume))
+    return true;
+
+  if (originator && originator->is_player ())
+    originator->contr->failmsg (format (
+       "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
+       query_name ()
+    ));
+
+  return false;
+}
+
 /*
  * decrease(object, number) decreases a specified number from
  * the amount of an object. If the amount reaches 0, the object
@@ -1677,9 +1742,9 @@
       update_stats ();
       update_all_los (map, x, y);
     }
-  else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
+  else if (is_player ())
     // if this is a player's inventory, update stats
-    update_stats ();
+    contr->queue_stats_update ();
 
   INVOKE_OBJECT (INSERT, this);
 
@@ -2457,15 +2522,6 @@
              : region::default_region ();
 }
 
-const materialtype_t *
-object::dominant_material () const
-{
-  if (materialtype_t *mt = name_to_material (materialname))
-    return mt;
-
-  return name_to_material (shstr_unknown);
-}
-
 void
 object::open_container (object *new_container)
 {