--- deliantra/server/common/object.C	2009/12/17 01:04:37	1.310
+++ 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>
 
@@ -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"
@@ -1319,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 *
@@ -2681,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;
+}
+