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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.178 by root, Fri Apr 22 06:10:34 2011 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
   client &socket = *pl->ns;
   object *ob = pl->viewpoint;
   if (socket.mapinfocmd)
     {
-      if (ob->map && ob->map->path[0])
+      if (ob->map && ob->map->path)
         {
           int flags = 0;
+          // due to historical glitches, the bit ordering and map index ordering differs
-          if (ob->map->tile_path[0]) flags |= 0x01;
+          if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01;
-          if (ob->map->tile_path[1]) flags |= 0x02;
+          if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02;
-          if (ob->map->tile_path[2]) flags |= 0x04;
+          if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04;
-          if (ob->map->tile_path[3]) flags |= 0x08;
+          if (ob->map->tile_path[TILE_WEST ]) flags |= 0x08;
           // these two are debatable
-          if (ob->map->tile_path[4]) flags |= 0x10;
+          if (ob->map->tile_path[TILE_UP   ]) flags |= 0x10;
-          if (ob->map->tile_path[5]) flags |= 0x20;
+          if (ob->map->tile_path[TILE_DOWN ]) flags |= 0x20;
           socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
                                      flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
                                      ob->map->width, ob->map->height, &ob->map->path);
         }
   while (*buf && map && max_distance)
     {
       int dir = *buf++ - '1';
+      // due to historical glitches, the mapinfo index and tile index differs
+      static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
       // maybe we should only allow the four flat directions
-      if (dir >= 0 && dir < TILE_NUM)
+      if (dir >= 0 && dir < array_length (dirmap))
         {
+          dir = dirmap [dir];
           if (!map->tile_path [dir])
             map = 0;
           else if (map->tile_available (dir, false))
             {
               maptile *neigh = map->tile_map [dir];
     send_packet_printf ("mapinfo %s nomap", token);
   else
     {
       int flags = 0;
+      // due to historical glitches, the bit ordering and map index ordering differs
-      if (map->tile_path[0]) flags |= 0x01;
+      if (map->tile_path[TILE_NORTH]) flags |= 0x01;
-      if (map->tile_path[1]) flags |= 0x02;
+      if (map->tile_path[TILE_EAST ]) flags |= 0x02;
-      if (map->tile_path[2]) flags |= 0x04;
+      if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
-      if (map->tile_path[3]) flags |= 0x08;
+      if (map->tile_path[TILE_WEST ]) flags |= 0x08;
       // these two are debatable
-      if (map->tile_path[4]) flags |= 0x10;
+      if (map->tile_path[TILE_UP   ]) flags |= 0x10;
-      if (map->tile_path[5]) flags |= 0x20;
+      if (map->tile_path[TILE_DOWN ]) flags |= 0x20;
       send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
     }
   return 1;
   for (maprect *rect = map->split_to_tiles (mapwalk_buf,
                           op->x - range    , op->y - range    ,
                           op->x + range + 1, op->y + range + 1);
        rect->m;
        ++rect)
+    {
-    rect->m->touch ();
+      rect->m->touch ();
+      rect->m->activate ();
+    }
 }
 // prefetch a generous area around the player, also up and down
-static void
+void
-prefetch_surrounding_maps (object *op)
+object::prefetch_surrounding_maps ()
 {
-  prefetch_surrounding_area (op, op->map, 40);
+  prefetch_surrounding_area (this, map, 40);
-  if (maptile *m = op->map->tile_available (TILE_DOWN))
+  if (maptile *m = map->tile_available (TILE_DOWN))
-    prefetch_surrounding_area (op, m, 20);
+    prefetch_surrounding_area (this, m, 20);
-  if (maptile *m = op->map->tile_available (TILE_UP))
+  if (maptile *m = map->tile_available (TILE_UP))
-    prefetch_surrounding_area (op, m, 20);
+    prefetch_surrounding_area (this, m, 20);
 }
 //+GPL
 /**
   /* If player is just joining the game, he isn't here yet, so the map
    * can get swapped out.  If so, don't try to send them a map.  All will
    * be OK once they really log in.
    */
-  if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
+  if (!ob->map || ob->map->state != MAP_ACTIVE)
     return;
   int startlen, oldlen;
   check_map_change (pl);
-  prefetch_surrounding_maps (pl->ob);
+  pl->ob->prefetch_surrounding_maps ();
   /* do LOS after calls to update_position */
   /* unfortunately, we need to udpate los when observing, currently */
   if (pl->do_los || pl->viewpoint != pl->ob)
     {

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.178 by root, Fri Apr 22 06:10:34 2011 UTC vs. Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.178 by root, Fri Apr 22 06:10:34 2011 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC