--- deliantra/server/common/object.C	2006/09/11 23:33:27	1.31
+++ deliantra/server/common/object.C	2006/09/11 23:53:30	1.32
@@ -907,8 +907,7 @@
 
 object *object::create ()
 {
-  object *
-    op;
+  object *op;
 
   if (freed.empty ())
     op = new object;
@@ -940,12 +939,12 @@
   if (QUERY_FLAG (this, FLAG_FREED))
     return;
 
-  if (!QUERY_FLAG (this, FLAG_REMOVED))
-    remove_ob (this);
-
   if (QUERY_FLAG (this, FLAG_FRIENDLY))
     remove_friendly_object (this);
 
+  if (!QUERY_FLAG (this, FLAG_REMOVED))
+    remove_ob (this);
+
   SET_FLAG (this, FLAG_FREED);
 
   if (more)
@@ -960,7 +959,7 @@
        * if some form of movement is allowed, let objects
        * drop on that space.
        */
-      if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
+      if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
         {
           object *op = inv;