--- deliantra/server/socket/request.C	2007/06/06 17:22:55	1.105
+++ deliantra/server/socket/request.C	2007/08/26 04:21:30	1.122
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT 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 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT 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.
  * 
- * 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.
+ * 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 GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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>
  */
@@ -132,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;
@@ -193,8 +194,8 @@
   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;
-      socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
     }
 }
 
@@ -204,29 +205,17 @@
  * that information.
  */
 void
-RequestInfo (char *buf, int len, client * ns)
+RequestInfo (char *buf, int len, client *ns)
 {
-  char *params = NULL, *cp;
-
-  /* No match */
-  char bigbuf[MAX_BUF];
-  int slen;
-
-  /* Set up replyinfo before we modify any of the buffers - this is used
-   * if we don't find a match.
-   */
-  strcpy (bigbuf, "replyinfo ");
-  slen = strlen (bigbuf);
-  safe_strcat (bigbuf, buf, &slen, MAX_BUF);
+  char *params;
 
   /* find the first space, make it null, and update the
    * params pointer.
    */
-  for (cp = buf; *cp != '\0'; cp++)
-    if (*cp == ' ')
+  for (params = buf; *params; params++)
+    if (*params == ' ')
       {
-        *cp = '\0';
-        params = cp + 1;
+        *params++ = 0;
         break;
       }
 
@@ -239,7 +228,13 @@
   else if (!strcmp (buf, "spell_paths"))
     send_spell_paths (ns, params);
   else
-    ns->send_packet (bigbuf, len);
+    {
+      // undo tokenisation above and send replyinfo with the request unchanged
+      if (*params)
+        *--params = ' ';
+
+      ns->send_packet_printf ("replyinfo %s", buf);
+    }
 }
 
 void
@@ -255,86 +250,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;
+      int dir = *buf++ - '1';
 
-      // 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
-
-      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];
 
-          --max_distance;
+              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;
+                }
+
+              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 */
@@ -473,27 +499,6 @@
 }
 
 /**
- * client requested an image. send it rate-limited
- * before flushing.
- */
-void
-AskFaceCmd (char *buf, int len, client *ns)
-{
-  ns->askface.push_back (atoi (buf));
-}
-
-/**
- * Tells client the picture it has to use 
- * to smooth a picture number given as argument.
- */
-void
-AskSmooth (char *buf, int len, client *ns)
-{
-  ns->send_face (atoi (buf));
-  ns->flush_fx ();
-}
-
-/**
  * This handles the general commands from the client (ie, north, fire, cast,
  * etc.)
  */
@@ -535,7 +540,7 @@
 {
   if (len <= 6)
     {
-      LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
+      LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
       return;
     }
 
@@ -733,9 +738,6 @@
 {
   dynbuf_text buf;
 
-  if (pl->observe->contr)
-    pl = pl->observe->contr;
-
   if (pl->ranged_ob)
     buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
 
@@ -752,8 +754,8 @@
   if (pl->golem)
     buf << " Golem*: "  << pl->golem->name;
 
+  buf << '\0';
   buf.linearise (obuf);
-  obuf [buf.size ()] = 0;
 }
 
 #define AddIfInt64(Old,New,Type) if (Old != New) {\
@@ -801,6 +803,8 @@
   if (!ob)
     return;
 
+  player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
+
   packet sl ("stats");
 
   AddIfShort (ns->last_stats.hp,       ob->stats.hp,       CS_STAT_HP);
@@ -818,7 +822,7 @@
   AddIfShort (ns->last_stats.Cha,      ob->stats.Cha,      CS_STAT_CHA);
 
   for (int s = 0; s < NUM_SKILLS; s++)
-    if (object *skill = pl->last_skill_ob[s])
+    if (object *skill = opl->last_skill_ob[s])
       if (skill->stats.exp != ns->last_skill_exp [s])
         {
           ns->last_skill_exp [s] = skill->stats.exp;
@@ -843,10 +847,10 @@
 
   flags = 0;
 
-  if (pl->fire_on)
+  if (opl->fire_on)
     flags |= SF_FIREON;
 
-  if (pl->run_on)
+  if (opl->run_on)
     flags |= SF_RUNON;
 
   AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
@@ -870,7 +874,7 @@
       AddIfInt (ns->last_path_denied,   ob->path_denied,   CS_STAT_SPELL_DENY);
     }
 
-  rangetostring (pl, buf);  /* we want use the new fire & run system in new client */
+  rangetostring (opl, buf);  /* we want use the new fire & run system in new client */
   AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
   set_title (ob, buf);
   AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
@@ -962,7 +966,7 @@
         if (ob)
           ns.send_faces (ob);
         else
-          ns.send_face (face_num);
+          ns.send_face (face_num, 10);
 
       sl << uint16 (face_num);
       return 1;
@@ -1033,12 +1037,10 @@
     return;
 
   int x, y, ax, ay, startlen, max_x, max_y, oldlen;
-  sint16 nx, ny;
   int estartlen, eoldlen;
   uint8 eentrysize;
   uint16 ewhatstart, ewhatflag;
   uint8 extendedinfos;
-  maptile *m;
 
   check_map_change (pl);
   prefetch_surrounding_maps (pl->ob);
@@ -1114,9 +1116,27 @@
 
   for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
     {
+      sint16 nx, ny;
+      maptile *m = 0;
+
       ax = 0;
       for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
         {
+          // check to see if we can simply go one right quickly
+          ++nx;
+          if (m && nx >= m->width)
+            m = 0;
+
+          if (!m)
+            {
+              nx = x; ny = y; m = plmap; 
+
+              if (xy_normalise (m, nx, ny))
+                m->touch ();
+              else
+                m = 0;
+            }
+
           int emask, mask;
           emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
 
@@ -1125,10 +1145,6 @@
           /* If the coordinates are not valid, or it is too dark to see,
            * we tell the client as such
            */
-          nx = x;
-          ny = y;
-          m = get_map_from_coord (plmap, &nx, &ny);
-
           if (!m)
             {
               /* space is out of map.  Update space and clear values
@@ -1144,8 +1160,6 @@
               continue;
             }
             
-          m->touch ();
-
           int d = pl->blocked_los[ax][ay];
 
           if (d > 3)
@@ -1219,6 +1233,7 @@
               lastcell.count = d;
 
               mapspace &ms = m->at (nx, ny);
+              ms.update ();
 
               if (socket.extmap)
                 {
@@ -1408,7 +1423,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);
@@ -1431,7 +1446,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);
@@ -1550,6 +1565,8 @@
       spell->face = face_find ("burnout.x11", blank_face);
     }
 
+  pl->ns->send_face (spell->face);
+
   /* send the current values */
   sl << uint32 (spell->count)
      << uint16 (spell->level)
@@ -1594,16 +1611,17 @@
            * won't take us over the length limit for the socket, if it does,
            * we need to send what we already have, and restart packet formation 
            */
+          if (spell->type != SPELL)
+            continue;
+
           /* Seeing crashes by overflowed buffers.  Quick arithemetic seems
            * to show add_spell is 26 bytes + 2 strings.  However, the overun
            * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
            * like it will fix this
            */
-          if (spell->type != SPELL)
-            continue;
-
-          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);
 
               sl.reset ();
@@ -1621,13 +1639,14 @@
   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);
     }
 
   /* finally, we can send the packet */
+  pl->ns->flush_fx ();
   pl->ns->send_packet (sl);
 }