--- deliantra/server/common/object.C	2009/11/10 04:38:45	1.303
+++ deliantra/server/common/object.C	2010/03/26 00:05:45	1.313
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -28,7 +28,6 @@
 #include <sys/uio.h>
 #include <object.h>
 #include <sproto.h>
-#include <loader.h>
 
 #include <bitset>
 
@@ -79,7 +78,7 @@
 }
 
 static void
-read_uuid (void)
+read_uuid ()
 {
   char filename[MAX_BUF];
 
@@ -250,12 +249,12 @@
  */
 bool object::can_merge_slow (object *ob1, object *ob2)
 {
-  /* A couple quicksanity checks */
+  /* A couple quick sanity checks */
   if (ob1 == ob2
       || ob1->type  != ob2->type
-      || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
       || ob1->value != ob2->value
-      || ob1->name  != ob2->name)
+      || ob1->name  != ob2->name
+      || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
     return 0;
 
   /* Do not merge objects if nrof would overflow, assume nrof
@@ -286,7 +285,7 @@
       || ob1->skill        != ob2->skill
       || ob1->value        != ob2->value
       || ob1->animation_id != ob2->animation_id
-      || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
+      || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
       || ob1->client_type  != ob2->client_type
       || ob1->material     != ob2->material
       || ob1->lore         != ob2->lore
@@ -523,6 +522,21 @@
 }
 
 /*
+ * Returns the object which has the uuid equal to the argument.
+ * MOAR VERRRY slow.
+ */
+
+object *
+find_object_uuid (UUID i)
+{
+  for_all_objects (op)
+   if (op->uuid == i)
+     return op;
+
+  return 0;
+}
+
+/*
  * Returns the first object which has a name equal to the argument.
  * Used only by the patch command, but not all that useful.
  * Enables features like "patch <name-of-other-player> food 999"
@@ -689,9 +703,6 @@
         }
     }
 
-  if (speed < 0)
-    dst->speed_left -= rndm ();
-
   dst->activate ();
 }
 
@@ -701,7 +712,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 = - speed - rndm (); // TODO animation
+  else
+    speed_left = -1.;
+
   /* 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
@@ -719,6 +735,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 = - neu->speed - rndm (); // TODO animation
+
   neu->map = map; // not copied by copy_to
   return neu;
 }
@@ -847,7 +868,7 @@
 
   //expmul = 1.0; declared const for the time being
   face     = blank_face;
-  material = &material_null;
+  material = MATERIAL_NULL;
 }
 
 object::~object ()
@@ -1128,18 +1149,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)
     {
@@ -1269,7 +1285,7 @@
 
   for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
     {
-      object *op = arch_to_object (at);
+      object *op = at->instance ();
 
       op->name    = name;
       op->name_pl = name_pl;
@@ -1317,7 +1333,7 @@
  *
  * Return value:
  *   new object if 'op' was merged with other object
- *   NULL if 'op' was destroyed
+ *   NULL if there was an error (destroyed, blocked etc.)
  *   just 'op' otherwise
  */
 object *
@@ -1554,7 +1570,7 @@
     if (tmp->arch->archname == archname)       /* same archetype */
       tmp->destroy ();
 
-  object *tmp = arch_to_object (archetype::find (archname));
+  object *tmp = archetype::find (archname)->instance ();
 
   tmp->x = op->x;
   tmp->y = op->y;
@@ -1740,9 +1756,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);
 
@@ -2563,7 +2579,7 @@
       // insert the "Close Container" object.
       if (archetype *closer = new_container->other_arch)
         {
-          object *closer = arch_to_object (new_container->other_arch);
+          object *closer = new_container->other_arch->instance ();
           closer->flag [FLAG_NO_MAP_SAVE] = 1;
           new_container->insert (closer);
         }
@@ -2679,3 +2695,19 @@
     }
 }
 
+void object::change_move_type (MoveType mt)
+{
+  if (move_type == mt)
+    return;
+
+  if (is_on_map ())
+    {
+      // we are on the map, so handle move_on/off effects
+      remove ();
+      move_type = mt;
+      map->insert (this, x, y, this);
+    }
+  else
+    move_type = mt;
+}
+