--- deliantra/server/common/object.C	2010/04/23 09:22:46	1.334
+++ deliantra/server/common/object.C	2010/04/25 10:45:38	1.335
@@ -1574,14 +1574,14 @@
   /* if this is not the head or flag has been passed, don't check walk on status */
   if (!(flag & INS_NO_WALK_ON) && op->is_head ())
     {
-      if (check_move_on (op, originator, flag))
+      if (check_move_on (op, originator))
         return 0;
 
       /* If we are a multi part object, let's work our way through the check
        * walk on's.
        */
       for (object *tmp = op->more; tmp; tmp = tmp->more)
-        if (check_move_on (tmp, originator, flag))
+        if (check_move_on (tmp, originator))
           return 0;
     }
 
@@ -1817,7 +1817,7 @@
  * on top.
  */
 int
-check_move_on (object *op, object *originator, int flags)
+check_move_on (object *op, object *originator)
 {
   if (op->flag [FLAG_NO_APPLY])
     return 0;
@@ -1886,9 +1886,6 @@
       if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
           ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
         {
-          if (tmp->type == EXIT && (flags & INS_NO_AUTO_EXIT)) //TODO: temporary, fix exits instead
-            continue;
-
           move_apply (tmp, op, originator);
 
           if (op->destroyed ())