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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2001 Mark Wedel
+ * Copyright (©) 2001,2007 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published by
+ * under the terms of the GNU General Public License as published by the Free
- * the Free Software Foundation; either version 2 of the License, or
+ * Software Foundation; either version 2 of the License, or (at your option)
- * (at your option) any later version.
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * GNU General Public License for more details.
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /**
  * \file
  * Client handling.
 /** check for map/region change and send new map data */
 static void
 check_map_change (player *pl)
 {
   client &socket = *pl->ns;
-  object *ob = pl->ob;
+  object *ob = pl->observe;
-  char buf[MAX_BUF];            /* eauugggh */
   if (socket.current_map != ob->map || socket.force_newmap)
     {
       clear_map (pl);
       socket.current_map = ob->map;
               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;
-              snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
+              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);
+                                         flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
+                                         ob->map->width, ob->map->height, &ob->map->path);
             }
           else
-            snprintf (buf, MAX_BUF, "mapinfo current");
-          socket.send_packet (buf);
+            socket.send_packet ("mapinfo current");
         }
     }
   else if (socket.current_x != ob->x || socket.current_y != ob->y)
     {
       int dx = ob->x - socket.current_x;
    * 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.
 /**
  * Get player's current range attack in obuf.
  */
 static void
-rangetostring (object *ob, char *obuf)
+rangetostring (player *pl, char *obuf)
 {
   dynbuf_text buf;
-  player *pl = ob->contr;
-  if (pl->ranged_skill)
-    {
-      buf.printf (" Range: %s", &pl->ranged_skill->name);
-      if (pl->ranged_ob)
+  if (pl->ranged_ob)
-        buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0));
+    buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
-    }
-  if (pl->combat_skill)
-    {
-      buf.printf (" Combat: %s", &pl->combat_skill->name);
-      if (pl->combat_ob)
+  if (pl->combat_ob)
-        buf.printf (" (%s)", query_base_name (pl->combat_ob, 0));
+    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.printf (" Golem: %s", &pl->golem->name);
+    buf << " Golem*: "  << pl->golem->name;
-  strcpy (obuf, buf.linearise () + 1);
+  buf.linearise (obuf);
+  obuf [buf.size ()] = 0;
 }
 #define AddIfInt64(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint64 (New); \
 #define AddIfShort(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint16 (New); \
                        }
-#define AddIfFloat(Old,New,Type) if (Old != New) {\
+#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
                         Old = New; \
-                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
+                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
                         }
 #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
                         free(Old); Old = strdup (New);\
                         sl << uint8 (Type) << data8 (New); \
   client *ns = pl->ns;
   if (!ns)
     return;
-  object *ob = pl->ob;
+  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
   AddIfInt64 (ns->last_stats.exp,  ob->stats.exp, CS_STAT_EXP64);
   AddIfShort (ns->last_level,      ob->level, CS_STAT_LEVEL);
   AddIfShort (ns->last_stats.wc,   ob->stats.wc, CS_STAT_WC);
   AddIfShort (ns->last_stats.ac,   ob->stats.ac, CS_STAT_AC);
   AddIfShort (ns->last_stats.dam,  ob->stats.dam, CS_STAT_DAM);
-  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED);
+  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f/TICK);
   AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
-  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP);
+  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 (ob, 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 */
 {
   prefetch_surrounding_maps (op->map, 3);
 }
 /**
- * This function uses the new map1 protocol command to send the map
+ * Draws client map.
- * to the client.  It is necessary because the old map command supports
- * a maximum map size of 15x15.
- * This function is much simpler than the old one.  This is because
- * the old function optimized to send as few face identifiers as possible,
- * at the expense of sending more coordinate location (coordinates were
- * only 1 byte, faces 2 bytes, so this was a worthwhile savings).  Since
- * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
- * maps no sense.  Instead, we actually really only use 12 bits for coordinates,
- * and use the other 4 bits for other informatiion.   For full documentation
- * of what we send, see the doc/Protocol file.
- * I will describe internally what we do:
- * the ns->lastmap shows how the map last looked when sent to the client.
- * in the lastmap structure, there is a cells array, which is set to the
- * maximum viewable size (As set in config.h).
- * in the cells, there are faces and a count value.
- * we use the count value to hold the darkness value.  If -1, then this space
- *   is not viewable.
- * we use faces[0] faces[1] faces[2] to hold what the three layers
- * look like.
  */
 void
-draw_client_map1 (object *pl)
+draw_client_map (player *pl)
 {
+  object *ob = pl->observe;
+  if (!ob->active)
+    return;
+  maptile *plmap = ob->map;
+  /* 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 (!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;
-  client &socket = *pl->contr->ns;
-  if (!pl->active)
-    return;
-  check_map_change (pl->contr);
+  check_map_change (pl);
-  prefetch_surrounding_maps (pl);
+  prefetch_surrounding_maps (pl->ob);
+  /* do LOS after calls to update_position */
+  if (ob != pl->ob)
+    clear_los (pl);
+  else if (pl->do_los)
+    {
+      update_los (ob);
+      pl->do_los = 0;
+    }
+  /**
+   * This function uses the new map1 protocol command to send the map
+   * to the client.  It is necessary because the old map command supports
+   * a maximum map size of 15x15.
+   * This function is much simpler than the old one.  This is because
+   * the old function optimized to send as few face identifiers as possible,
+   * at the expense of sending more coordinate location (coordinates were
+   * only 1 byte, faces 2 bytes, so this was a worthwhile savings).  Since
+   * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
+   * maps no sense.  Instead, we actually really only use 12 bits for coordinates,
+   * and use the other 4 bits for other informatiion.   For full documentation
+   * of what we send, see the doc/Protocol file.
+   * I will describe internally what we do:
+   * the ns->lastmap shows how the map last looked when sent to the client.
+   * in the lastmap structure, there is a cells array, which is set to the
+   * maximum viewable size (As set in config.h).
+   * in the cells, there are faces and a count value.
+   * we use the count value to hold the darkness value.  If -1, then this space
+   *   is not viewable.
+   * we use faces[0] faces[1] faces[2] to hold what the three layers
+   * look like.
+   */
+  client &socket = *pl->ns;
   packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
   packet esl;
   startlen = sl.length ();
   ay = 0;
   /* We could do this logic as conditionals in the if statement,
    * but that started to get a bit messy to look at.
    */
-  max_x = pl->x + (socket.mapx + 1) / 2;
+  max_x = ob->x + (socket.mapx + 1) / 2;
-  max_y = pl->y + (socket.mapy + 1) / 2;
+  max_y = ob->y + (socket.mapy + 1) / 2;
-  maptile *plmap = pl->map;
-  for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
+  for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
     {
+      sint16 nx, ny;
+      maptile *m = 0;
       ax = 0;
-      for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
+      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
               continue;
             }
           m->touch ();
-          int d = pl->contr->blocked_los[ax][ay];
+          int d = pl->blocked_los[ax][ay];
           if (d > 3)
             {
               int need_send = 0, count;
                 }
               lastcell.count = d;
               mapspace &ms = m->at (nx, ny);
+              ms.update ();
               if (socket.extmap)
                 {
                   uint8 stat_hp    = 0;
                   uint8 stat_width = 0;
                                || 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->tail_x;
+                              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 != pl)
+                      if (op->type == PLAYER && op != ob)
                         player = op->count;
                     }
                   if (lastcell.stat_hp != stat_hp)
                     {
               /* Middle face */
               if (update_space (sl, socket, ms, lastcell, 1))
                 mask |= 0x2;
-              if (ms.player () == pl
+              if (ms.player () == ob
-                  && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
+                  && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
                 {
                   // force player to be visible to himself if invisible
-                  if (lastcell.faces[0] != pl->face)
+                  if (lastcell.faces[0] != ob->face)
                     {
-                      lastcell.faces[0] = pl->face;
+                      lastcell.faces[0] = ob->face;
                       mask |= 0x1;
-                      sl << uint16 (pl->face);
+                      sl << uint16 (ob->face);
-                      socket.send_faces (pl);
+                      socket.send_faces (ob);
                     }
                 }
               /* Top face */
               else if (update_space (sl, socket, ms, lastcell, 0))
                 mask |= 0x1;
               /* Check to see if we are in fact sending anything for this
                * space by checking the mask.  If so, update the mask.
                * if not, reset the len to that from before adding the mask
                * value, so we don't send those bits.
       socket.send_packet (sl);
       socket.sent_scroll = 0;
     }
 }
-/**
- * Draws client map.
- */
-void
-draw_client_map (object *pl)
-{
-  int i, j;
-  sint16 ax, ay;        /* ax and ay goes from 0 to max-size of arrays */
-  int mflags;
-  struct Map newmap;
-  maptile *m, *pm;
-  if (pl->type != PLAYER)
-    {
-      LOG (llevError, "draw_client_map called with non player/non eric-server\n");
-      return;
-    }
-  pm = pl->map;
-  /* 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 (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
-    return;
-  memset (&newmap, 0, sizeof (struct Map));
-  for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
-    for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
-      {
-        ax = i;
-        ay = j;
-        m = pm;
-        mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
-        if (mflags & P_OUT_OF_MAP)
-          continue;
-        /* If a map is visible to the player, we don't want to swap it out
-         * just to reload it.  This should really call something like
-         * swap_map, but this is much more efficient and 'good enough'
-         */
-        if (mflags & P_NEW_MAP)
-          m->timeout = 50;
-      }
-  /* do LOS after calls to update_position */
-  if (pl->contr->do_los)
-    {
-      update_los (pl);
-      pl->contr->do_los = 0;
-    }
-  /* Big maps need a different drawing mechanism to work */
-  draw_client_map1 (pl);
-}
 /*****************************************************************************/
 /* GROS: The following one is used to allow a plugin to send a generic cmd to*/
 /* a player. Of course, the client need to know the command to be able to    */
 /* manage it !                                                               */
 /*****************************************************************************/
 void
 send_plugin_custom_message (object *pl, char *buf)
 {
   pl->contr->ns->send_packet (buf);

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.91 by root, Mon Apr 30 04:25:30 2007 UTC vs. Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC