--- deliantra/server/common/object.C	2009/11/06 13:31:47	1.296
+++ deliantra/server/common/object.C	2009/11/10 00:01:31	1.302
@@ -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;
@@ -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;
@@ -681,12 +746,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 ())
@@ -746,6 +805,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))
@@ -760,8 +820,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
@@ -1507,6 +1570,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
@@ -2434,15 +2519,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)
 {