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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC vs.
Revision 1.118 by root, Sun Jul 29 19:11:47 2007 UTC

 /*
- * 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
+ * Crossfire TRT is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /**
   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;
-      socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
     }
 }
 /**
  * RequestInfo is sort of a meta command. There is some specific
  * request of information, but we call other functions to provide
  * that information.
  */
 void
-RequestInfo (char *buf, int len, client * ns)
+RequestInfo (char *buf, int len, client *ns)
 {
-  char *params = NULL, *cp;
+  char *params;
-  /* 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);
   /* find the first space, make it null, and update the
    * params pointer.
    */
-  for (cp = buf; *cp != '\0'; cp++)
+  for (params = buf; *params; params++)
-    if (*cp == ' ')
+    if (*params == ' ')
       {
-        *cp = '\0';
-        params = cp + 1;
+        *params++ = 0;
         break;
       }
   if (!strcmp (buf, "image_info"))
     send_image_info (ns, params);
   else if (!strcmp (buf, "skill_info"))
     send_skill_info (ns, params);
   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
 ExtCmd (char *buf, int len, player *pl)
 {
   ns->send_packet (cmdback);
 }
 /**
- * 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.)
  */
 void
 PlayerCmd (char *buf, int len, player *pl)
    * commands.
    */
   pl->count = 0;
 }
 /**
  * This handles the general commands from the client (ie, north, fire, cast,
  * etc.).  It is a lot like PlayerCmd above, but is called with the
  * 'ncom' method which gives more information back to the client so it
  * can throttle.
 void
 NewPlayerCmd (char *buf, int len, player *pl)
 {
   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;
     }
   uint16 cmdid  = net_uint16 ((uint8 *)buf);
   sint32 repeat = net_sint32 ((uint8 *)buf + 2);
     buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
   if (pl->combat_ob)
     buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
+#if 0
   //TODO: remove this when slot system is working, this is only for debugging
   if (pl->ob->chosen_skill)
     buf << " Skill*: "  << pl->ob->chosen_skill->name;
+#endif
   //TODO: maybe golem should become the current_weapon, quite simply?
   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) {\
                         Old = New; \
                         sl << uint8 (Type) << uint64 (New); \
     return;
   object *ob = pl->observe;
   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);
   AddIfShort (ns->last_stats.maxhp,    ob->stats.maxhp,    CS_STAT_MAXHP);
   AddIfShort (ns->last_stats.Wis,      ob->stats.Wis,      CS_STAT_WIS);
   AddIfShort (ns->last_stats.Pow,      ob->stats.Pow,      CS_STAT_POW);
   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;
           /* Always send along the level if exp changes.  This is only
   AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
   AddIfInt   (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
   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);
   if (ns->sc_version < 1025)
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
       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);
   /* Only send it away if we have some actual data */
       if (!ns.faces_sent[face_num])
         if (ob)
           ns.send_faces (ob);
         else
-          ns.send_face (face_num);
+          ns.send_face (face_num, 10);
       sl << uint16 (face_num);
       return 1;
     }
    */
   if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
     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);
   /* do LOS after calls to update_position */
   max_x = ob->x + (socket.mapx + 1) / 2;
   max_y = ob->y + (socket.mapy + 1) / 2;
   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 = 0;
+            }
           int emask, mask;
           emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
           MapCell &lastcell = socket.lastmap.cells[ax][ay];
           /* 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
                * if this hasn't already been done.  If the space is out
                * of the map, it shouldn't have a head
                 }
               lastcell.count = d;
               mapspace &ms = m->at (nx, ny);
+              ms.update ();
               if (socket.extmap)
                 {
                   uint8 stat_hp    = 0;
                   uint8 stat_width = 0;
   sl << "replyinfo skill_info\n";
   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);
     }
   sl << "replyinfo spell_paths\n";
   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);
     }
   if (!spell->face)
     {
       LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
       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)
      << uint16 (spell->casting_time)
            * bytes and 3 strings (because that is the spec) so we need to
            * check that the length of those 3 strings, plus the 23 bytes,
            * 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 ();
               sl << "addspell ";
             }
       return;
     }
   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);
 }

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC vs. Revision 1.118 by root, Sun Jul 29 19:11:47 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC vs.
Revision 1.118 by root, Sun Jul 29 19:11:47 2007 UTC