[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.334 by root, Fri Apr 23 09:22:46 2010 UTC vs.
Revision 1.335 by root, Sun Apr 25 10:45:38 2010 UTC

    */
   /* 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;
     }
   return op;
 }
  * MSW 2001-07-08: Check all objects on space, not just those below
  * object being inserted.  insert_ob_in_map may not put new objects
  * 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;
   object *tmp;
       /* Basically same logic as above, except now for actual apply. */
       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 ())
             return 1;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines