--- deliantra/server/common/object.C	2007/01/18 16:19:34	1.117
+++ deliantra/server/common/object.C	2007/01/24 22:42:48	1.122
@@ -491,7 +491,7 @@
     SET_FLAG (dst, FLAG_REMOVED);
 
   if (speed < 0)
-    dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
+    dst->speed_left = speed_left - rndm ();
 
   /* Copy over key_values, if any. */
   if (key_values)
@@ -672,6 +672,8 @@
 
 object::~object ()
 {
+  unlink ();
+
   free_key_values (this);
 }
 
@@ -689,7 +691,9 @@
 
 void object::unlink ()
 {
-  assert (index);//D
+  if (!index)
+    return;
+
   objects.erase (this);
   refcnt_dec ();
 }
@@ -773,6 +777,7 @@
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_IN_MEMORY
+      || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
@@ -1748,7 +1753,7 @@
             {
 
               float
-                diff = tmp->move_slow_penalty * FABS (op->speed);
+                diff = tmp->move_slow_penalty * fabs (op->speed);
 
               if (op->type == PLAYER)
                 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||