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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.176 by root, Thu Apr 29 15:59:10 2010 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 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,2012 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 //+GPL
   pl->ns->mapinfo_queue_clear ();
   memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
   pl->ns->force_newmap = false;
-  if (pl->ns->newmapcmd == 1)
-    pl->ns->send_packet ("newmap");
+  pl->ns->send_packet ("newmap");
   pl->ns->floorbox_reset ();
 }
 static void
 send_map_info (player *pl)
   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 |= 1;
+          if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
-          if (ob->map->tile_path[1]) flags |= 2;
+          if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
-          if (ob->map->tile_path[2]) flags |= 4;
+          if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
-          if (ob->map->tile_path[3]) flags |= 8;
+          if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
+          // these two are debatable
+          if (ob->map->tile_path [TILE_UP   ]) flags |= 0x10;
+          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);
         }
     {
       INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
       socket.current_region = reg;
     }
-  // first try to aovid a full newmap on tiled map scrolls
+  // first try to avoid a full newmap on tiled map scrolls
   if (socket.current_map != ob->map && !socket.force_newmap)
     {
       rv_vector rv;
       get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
   while (*buf && map && max_distance)
     {
       int dir = *buf++ - '1';
-      if (dir >= 0 && dir <= 3)
+      // 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 (IN_RANGE_EXC (dir, 0, 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 |= 1;
+      if (map->tile_path [TILE_NORTH]) flags |= 0x01;
-      if (map->tile_path[1]) flags |= 2;
+      if (map->tile_path [TILE_EAST ]) flags |= 0x02;
-      if (map->tile_path[2]) flags |= 4;
+      if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
-      if (map->tile_path[3]) flags |= 8;
+      if (map->tile_path [TILE_WEST ]) flags |= 0x08;
+      // these two are debatable
+      if (map->tile_path [TILE_UP   ]) flags |= 0x10;
+      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;
   /* Nothing changed */
   return 0;
 }
-//-GPL
-// prefetch maps in an area of PREFETCH x PREFETCH around the player
-#define PREFETCH 40
-// prefetch a generous area around the player
-static void
-prefetch_surrounding_maps (object *op)
-{
-  for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
-                          op->x - PREFETCH    , op->y - PREFETCH    ,
-                          op->x + PREFETCH + 1, op->y + PREFETCH + 1);
-       rect->m;
-       ++rect)
-    rect->m->touch ();
-}
-//+GPL
 /**
  * Draws client map.
  */
 void
 draw_client_map (player *pl)
   /* 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)
     {
    * look like.
    */
   client &socket = *pl->ns;
-  packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
+  packet sl ("map1a");
   startlen = sl.length ();
   int hx = socket.mapx / 2;
   int hy = socket.mapy / 2;
 /* appends the spell *spell to the Socklist we will send the data to. */
 static void
 append_spell (player *pl, packet &sl, object *spell)
 {
-  int i, skill = 0;
+  int skill = 0;
   if (!(spell->name))
     {
       LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
       return;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.176 by root, Thu Apr 29 15:59:10 2010 UTC vs. Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.176 by root, Thu Apr 29 15:59:10 2010 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC