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

Comparing deliantra/server/server/move.C (file contents):
Revision 1.8 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.13 by root, Thu Jan 4 16:19:32 2007 UTC

 move_ob (object *op, int dir, object *originator)
 {
   sint16 newx = op->x + freearr_x[dir];
   sint16 newy = op->y + freearr_y[dir];
   object *tmp;
-  mapstruct *m;
+  maptile *m;
   int mflags;
   if (op == NULL)
     {
       LOG (llevError, "Trying to move NULL.\n");
   /* If the space the player is trying to is out of the map,
    * bail now - we know it can't work.
    */
   if (mflags & P_OUT_OF_MAP)
     return 0;
   /* Is this space blocked?  Players with wizpass are immune to
    * this condition.
    */
   if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS))
   /* 0.94.2 - we need to set the direction for the new animation code.
    * it uses it to figure out face to use - I can't see it
    * breaking anything, but it might.
    */
-  if (op->more != NULL && !move_ob (op->more, dir, op->more->head))
+  if (op->more && !move_ob (op->more, dir, op->more->head))
     return 0;
   op->direction = dir;
   if (op->will_apply & 4)
     check_earthwalls (op, m, newx, newy);
   if (op->will_apply & 8)
     check_doors (op, m, newx, newy);
   /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
    * to remove a removed object, and this function was the culprit.  A possible
    * ok - the caller will deal with actual object removal/insertion
    */
   if (op->head)
     return 1;
-  remove_ob (op);
+  if (m != op->map && op->contr)
+    {
+      if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)))
+        return 0;
+      op->remove ();
+      if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
+        return 0;
+      if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy)))
+        return 0;
+    }
+  else
+    op->remove ();
   /* we already have newx, newy, and m, so lets use them.
    * In addition, this fixes potential crashes, because multipart object was
    * on edge of map, +=x, +=y doesn't make correct coordinates.
    */
   if (i == -1)
     return 0;                   /* No free spot */
   if (op->head != NULL)
     op = op->head;
-  remove_ob (op);
+  op->remove ();
   for (tmp = op; tmp != NULL; tmp = tmp->more)
     tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x),
       tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
   tmp = insert_ob_in_map (op, op->map, originator, 0);
 teleport (object *teleporter, uint8 tele_type, object *user)
 {
   object *altern;
   int i, j, k, nrofalt = 0;
   object *other_teleporter, *tmp;
-  mapstruct *m;
+  maptile *m;
   sint16 sx, sy;
   if (user == NULL)
     return 0;
   if (user->head != NULL)
         if (i == 0 && j == 0)
           continue;
         /* Perhaps this should be extended to support tiled maps */
         if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
           continue;
-        other_teleporter = get_map_ob (teleporter->map, teleporter->x + i, teleporter->y + j);
+        other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
         while (other_teleporter)
           {
             if (other_teleporter->type == tele_type)
               break;
         }
       else
         return 0;
     }
-  remove_ob (user);
+  user->remove ();
   /* Update location for the object */
   for (tmp = user; tmp != NULL; tmp = tmp->more)
     {
       tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
  * This is currently only used for the boulder roll code.
  * Returns 1 if object does not fit, 0 if it does.
  */
 int
-try_fit (object *op, mapstruct *m, int x, int y)
+try_fit (object *op, maptile *m, int x, int y)
 {
   object *tmp, *more;
   sint16 tx, ty;
   int mflags;
-  mapstruct *m2;
+  maptile *m2;
   if (op->head)
     op = op->head;
   for (more = op; more; more = more->more)
       mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty);
       if (mflags & P_OUT_OF_MAP)
         return 1;
-      for (tmp = get_map_ob (m2, tx, ty); tmp; tmp = tmp->above)
+      for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
         {
           if (tmp->head == op || tmp == op)
             continue;
           if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR))
 roll_ob (object *op, int dir, object *pusher)
 {
   object *tmp;
   sint16 x, y;
   int flags;
-  mapstruct *m;
+  maptile *m;
   MoveType move_block;
   if (op->head)
     op = op->head;
   move_block = GET_MAP_MOVE_BLOCK (m, x, y);
   /* If the target space is not blocked, no need to look at the objects on it */
   if ((op->move_type & move_block) == op->move_type)
     {
-      for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
+      for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
         {
           if (tmp->head == op)
             continue;
           if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
             return 0;
         }
     }
   if (try_fit (op, m, x, y))
     return 0;
-  remove_ob (op);
+  op->remove ();
   for (tmp = op; tmp != NULL; tmp = tmp->more)
     tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
   insert_ob_in_map (op, op->map, pusher, 0);
   return 1;
 }
   int str1, str2;
   object *owner;
   if (who->head != NULL)
     who = who->head;
-  owner = get_owner (who);
+  owner = who->owner;
   /* Wake up sleeping monsters that may be pushed */
   CLEAR_FLAG (who, FLAG_SLEEP);
   /* player change place with his pets or summoned creature */
       && owner == pusher
 #endif
     )
     {
       int temp;
-      mapstruct *m;
+      maptile *m;
-      remove_ob (who);
+      who->remove ();
-      remove_ob (pusher);
+      pusher->remove ();
       temp = pusher->x;
       pusher->x = who->x;
       who->x = temp;
       temp = pusher->y;

Diff Legend

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

Comparing deliantra/server/server/move.C (file contents): Revision 1.8 by root, Thu Sep 14 22:34:04 2006 UTC vs. Revision 1.13 by root, Thu Jan 4 16:19:32 2007 UTC

Diff Legend

Comparing deliantra/server/server/move.C (file contents):
Revision 1.8 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.13 by root, Thu Jan 4 16:19:32 2007 UTC