--- deliantra/server/socket/request.C	2007/07/29 18:34:46	1.117
+++ deliantra/server/socket/request.C	2008/08/01 16:31:58	1.135
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of 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 <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /**
@@ -131,6 +131,8 @@
 static void
 clear_map (player *pl)
 {
+  pl->ns->mapinfo_queue_clear ();
+
   memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
 
   pl->ns->force_newmap = false;
@@ -141,6 +143,32 @@
   pl->ns->floorbox_reset ();
 }
 
+static void
+send_map_info (player *pl)
+{
+  client &socket = *pl->ns;
+  object *ob = pl->observe;
+
+  if (socket.mapinfocmd)
+    {
+      if (ob->map && ob->map->path[0])
+        {
+          int flags = 0;
+
+          if (ob->map->tile_path[0]) flags |= 1;
+          if (ob->map->tile_path[1]) flags |= 2;
+          if (ob->map->tile_path[2]) flags |= 4;
+          if (ob->map->tile_path[3]) flags |= 8;
+
+          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);
+        }
+      else
+        socket.send_packet ("mapinfo current");
+    }
+}
+
 /** check for map/region change and send new map data */
 static void
 check_map_change (player *pl)
@@ -148,30 +176,39 @@
   client &socket = *pl->ns;
   object *ob = pl->observe;
 
-  if (socket.current_map != ob->map || socket.force_newmap)
+  region *reg = ob->region ();
+  if (socket.current_region != reg)
     {
-      clear_map (pl);
-      socket.current_map = ob->map;
+      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
+  if (socket.current_map != ob->map && !socket.force_newmap)
+    {
+      rv_vector rv;
 
-      if (socket.mapinfocmd)
+      get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
+
+      // manhattan distance is very handy here
+      if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
         {
-          if (ob->map && ob->map->path[0])
-            {
-              int flags = 0;
+          socket.current_map = ob->map;
+          socket.current_x   = ob->x;
+          socket.current_y   = ob->y;
 
-              if (ob->map->tile_path[0]) flags |= 1;
-              if (ob->map->tile_path[1]) flags |= 2;
-              if (ob->map->tile_path[2]) flags |= 4;
-              if (ob->map->tile_path[3]) flags |= 8;
-
-              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);
-            }
-          else
-            socket.send_packet ("mapinfo current");
+          socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
+          socket.floorbox_reset ();
+          send_map_info (pl);
         }
     }
+
+  if (socket.current_map != ob->map || socket.force_newmap)
+    {
+      clear_map (pl);
+      socket.current_map = ob->map;
+      send_map_info (pl);
+    }
   else if (socket.current_x != ob->x || socket.current_y != ob->y)
     {
       int dx = ob->x - socket.current_x;
@@ -188,13 +225,6 @@
 
   socket.current_x = ob->x;
   socket.current_y = ob->y;
-
-  region *reg = ob->region ();
-  if (socket.current_region != reg)
-    {
-      INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
-      socket.current_region = reg;
-    }
 }
 
 /**
@@ -248,86 +278,117 @@
 }
 
 void
-MapInfoCmd (char *buf, int len, player *pl)
+client::mapinfo_queue_clear ()
 {
-  // <mapinfo tag spatial tile-path
-  // >mapinfo tag spatial flags x y w h hash
+  for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
+    free (*i);
 
-  char bigbuf[MAX_BUF], *token;
+  mapinfo_queue.clear ();
+}
 
-  token = buf;
-  // copy token
-  if (!(buf = strchr (buf, ' ')))
-    return;
+bool
+client::mapinfo_try (char *buf)
+{
+  char *token = buf;
+  buf += strlen (buf) + 9;
 
-  *buf++ = 0;
+  // initial map and its origin
+  maptile *map = pl->observe->map;
+  int mapx = pl->ns->mapx / 2 - pl->observe->x;
+  int mapy = pl->ns->mapy / 2 - pl->observe->y;
+  int max_distance = 8;     // limit maximum path length to something generous
 
-  if (!strncmp (buf, "spatial ", 8))
+  while (*buf && map && max_distance)
     {
-      buf += 8;
-
-      // initial map and its origin
-      maptile *map = pl->ob->map;
-      sint16 dx, dy;
-      int mapx = pl->ns->mapx / 2 - pl->ob->x;
-      int mapy = pl->ns->mapy / 2 - pl->ob->y;
-      int max_distance = 8;     // limit maximum path length to something generous
+      int dir = *buf++ - '1';
 
-      while (*buf && map && max_distance)
+      if (dir >= 0 && dir <= 3)
         {
-          int dir = *buf++;
-
-          switch (dir)
+          if (!map->tile_path [dir])
+            map = 0;
+          else if (map->tile_available (dir, false))
             {
-              case '1':
-                dx = 0;
-                dy = -1;
-                map = map->xy_find (dx, dy);
-                map && (mapy -= map->height);
-                break;
-              case '2':
-                mapx += map->width;
-                dx = map->width;
-                dy = 0;
-                map = map->xy_find (dx, dy);
-                break;
-              case '3':
-                mapy += map->height;
-                dx = 0;
-                dy = map->height;
-                map = map->xy_find (dx, dy);
-                break;
-              case '4':
-                dx = -1;
-                dy = 0;
-                map = map->xy_find (dx, dy);
-                map && (mapx -= map->width);
-                break;
-            }
+              maptile *neigh = map->tile_map [dir];
+
+              switch (dir)
+                {
+                  case 0: mapy -= neigh->height; break;
+                  case 2: mapy += map  ->height; break;
+                  case 3: mapx -= neigh->width ; break;
+                  case 1: mapx += map  ->width ; break;
+                }
 
-          --max_distance;
+              map = neigh;
+              --max_distance;
+            }
+          else
+            return 0;
         }
+      else
+        max_distance = 0;
+    }
 
-      if (!max_distance)
-        snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
-      else if (map && map->path[0])
-        {
-          int flags = 0;
+  if (!max_distance)
+    send_packet_printf ("mapinfo %s error", token);
+  else if (!map || !map->path)
+    send_packet_printf ("mapinfo %s nomap", token);
+  else
+    {
+      int flags = 0;
 
-          if (map->tile_path[0]) flags |= 1;
-          if (map->tile_path[1]) flags |= 2;
-          if (map->tile_path[2]) flags |= 4;
-          if (map->tile_path[3]) flags |= 8;
+      if (map->tile_path[0]) flags |= 1;
+      if (map->tile_path[1]) flags |= 2;
+      if (map->tile_path[2]) flags |= 4;
+      if (map->tile_path[3]) flags |= 8;
 
-          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
-        }
+      send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
+    }
+
+  return 1;
+}
+
+void
+client::mapinfo_queue_run ()
+{
+  if (mapinfo_queue.empty () || !pl)
+    return;
+
+  for (int i = 0; i < mapinfo_queue.size (); ++i)
+    if (mapinfo_try (mapinfo_queue [i]))
+      {
+        free (mapinfo_queue [i]);
+        mapinfo_queue.erase (i);
+      }
+    else
+      ++i;
+}
+
+void
+MapInfoCmd (char *buf, int len, player *pl)
+{
+  // <mapinfo tag spatial tile-path
+  // >mapinfo tag spatial flags x y w h hash
+
+  char *token = buf;
+
+  if (!(buf = strchr (buf, ' ')))
+    return;
+
+  if (!strncmp (buf, " spatial ", 9))
+    {
+      char *copy = strdup (token);
+      copy [buf - token] = 0;
+
+#if 0
+      // this makes only sense when we flush the buffer immediately
+      if (pl->ns->mapinfo_try (copy))
+        free (copy);
       else
-        snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
+#endif
+        pl->ns->mapinfo_queue.push_back (copy);
     }
   else
-    snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
-
-  pl->ns->send_packet (bigbuf);
+    pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
 }
 
 /** This is the Setup cmd */
@@ -655,30 +716,15 @@
 void
 MoveCmd (char *buf, int len, player *pl)
 {
-  int vals[3], i;
+  int to, tag, nrof;
 
-  /* A little funky here.  We only cycle for 2 records, because
-   * we obviously are not going to find a space after the third
-   * record. Perhaps we should just replace this with a
-   * sscanf?
-   */
-  for (i = 0; i < 2; i++)
+  if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
     {
-      vals[i] = atoi (buf);
-
-      if (!(buf = strchr (buf, ' ')))
-        {
-          LOG (llevError, "Incomplete move command: %s\n", buf);
-          return;
-        }
-
-      buf++;
+      LOG (llevError, "Incomplete move command: %s\n", buf);
+      return;
     }
 
-  vals[2] = atoi (buf);
-
-/*    LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
-  esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
+  esrv_move_object (pl->ob, to, tag, nrof);
 }
 
 /******************************************************************************
@@ -855,8 +901,10 @@
  * Tells the client that here is a player it should start using.
  */
 void
-esrv_new_player (player *pl, uint32 weight)
+esrv_new_player (player *pl)
 {
+  sint32 weight = pl->ob->client_weight ();
+
   packet sl ("player");
 
   sl << uint32 (pl->ob->count)
@@ -1000,7 +1048,7 @@
    * can get swapped out.  If so, don't try to send them a map.  All will
    * be OK once they really log in.
    */
-  if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
+  if (!plmap || plmap->in_memory != MAP_ACTIVE)
     return;
 
   int x, y, ax, ay, startlen, max_x, max_y, oldlen;
@@ -1098,7 +1146,9 @@
             {
               nx = x; ny = y; m = plmap; 
 
-              if (!xy_normalise (m, nx, ny))
+              if (xy_normalise (m, nx, ny))
+                m->touch ();
+              else
                 m = 0;
             }
 
@@ -1125,13 +1175,10 @@
               continue;
             }
             
-          m->touch ();
-
           int d = pl->blocked_los[ax][ay];
 
           if (d > 3)
             {
-
               int need_send = 0, count;
 
               /* This block deals with spaces that are not visible for whatever
@@ -1147,11 +1194,11 @@
 
               count = -1;
 
-              /* properly clear a previously sent big face */
               if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
                   || lastcell.stat_hp || lastcell.flags || lastcell.player)
                 need_send = 1;
 
+              /* properly clear a previously sent big face */
               map_clearcell (&lastcell, count);
 
               if ((mask & 0xf) || need_send)
@@ -1211,25 +1258,26 @@
 
                   // send hp information, if applicable
                   if (object *op = ms.faces_obj [0])
-                    {
-                      if (op->head || op->invisible)
-                        ;       // do not show
-                      else if (op->type == PLAYER
-                               || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
-                        {
-                          if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
-                            {
-                              stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
-                              stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
-                            }
-                        }
-
-                      if (op->msg && op->msg[0] == '@')
-                        flags |= 1;
-
-                      if (op->type == PLAYER && op != ob)
-                        player = op->count;
-                    }
+                    if (op->is_head () && !op->invisible)
+                      {
+                        if (op->stats.maxhp > op->stats.hp
+                            && op->stats.maxhp > 0
+                            && (op->type == PLAYER
+                                || op->type == DOOR // does not work, have maxhp 0
+                                || QUERY_FLAG (op, FLAG_MONSTER)
+                                || QUERY_FLAG (op, FLAG_ALIVE)
+                                || QUERY_FLAG (op, FLAG_GENERATOR)))
+                          {
+                            stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
+                            stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
+                          }
+
+                        if (op->has_dialogue ())
+                          flags |= 1;
+
+                        if (op->type == PLAYER)
+                          player = ob == op ? pl->ob->count : op->count;
+                      }
 
                   if (lastcell.stat_hp != stat_hp)
                     {
@@ -1390,7 +1438,7 @@
   for (int i = 1; i < NUM_SKILLS; i++)
     sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
 
-  if (sl.length () >= MAXSOCKBUF)
+  if (sl.length () > MAXSOCKBUF)
     {
       LOG (llevError, "Buffer overflow in send_skill_info!\n");
       fatal (0);
@@ -1413,7 +1461,7 @@
   for (int i = 0; i < NRSPELLPATHS; i++)
     sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
 
-  if (sl.length () >= MAXSOCKBUF)
+  if (sl.length () > MAXSOCKBUF)
     {
       LOG (llevError, "Buffer overflow in send_spell_paths!\n");
       fatal (0);
@@ -1442,21 +1490,21 @@
           int flags = 0;
 
           /* check if we need to update it */
-          if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
+          if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
             {
-              spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+              spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
               flags |= UPD_SP_MANA;
             }
 
-          if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
+          if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
             {
-              spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+              spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
               flags |= UPD_SP_GRACE;
             }
 
-          if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
+          if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
             {
-              spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+              spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
               flags |= UPD_SP_DAMAGE;
             }
 
@@ -1468,9 +1516,9 @@
                  << uint8 (flags)
                  << uint32 (spell->count);
 
-              if (flags & UPD_SP_MANA  ) sl << uint16 (spell->last_sp);
-              if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
-              if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
+              if (flags & UPD_SP_MANA  ) sl << uint16 (spell->cached_sp);
+              if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
+              if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
 
               pl->ns->send_packet (sl);
             }
@@ -1510,9 +1558,9 @@
     }
 
   /* store costs and damage in the object struct, to compare to later */
-  spell->last_sp    = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
-  spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
-  spell->last_eat   = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+  spell->cached_sp    = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+  spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+  spell->cached_eat   = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
 
   /* figure out which skill it uses, if it uses one */
   if (spell->skill)
@@ -1538,9 +1586,9 @@
   sl << uint32 (spell->count)
      << uint16 (spell->level)
      << uint16 (spell->casting_time)
-     << uint16 (spell->last_sp)
-     << uint16 (spell->last_grace)
-     << uint16 (spell->last_eat)
+     << uint16 (spell->cached_sp)
+     << uint16 (spell->cached_grace)
+     << uint16 (spell->cached_eat)
      << uint8  (skill)
      << uint32 (spell->path_attuned)
      << uint32 (spell->face)
@@ -1586,7 +1634,7 @@
            * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
            * like it will fix this
            */
-          if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
+          if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
             {
               pl->ns->flush_fx ();
               pl->ns->send_packet (sl);
@@ -1606,7 +1654,7 @@
   else
     append_spell (pl, sl, spell);
 
-  if (sl.length () >= MAXSOCKBUF)
+  if (sl.length () > MAXSOCKBUF)
     {
       LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
       fatal (0);