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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 03:16:56 2007 UTC

  * before flushing.
  */
 void
 AskFaceCmd (char *buf, int len, client *ns)
 {
-  ns->askface.push_back (atoi (buf));
+  ns->ixface.push_back (atoi (buf));
 }
 /**
  * Tells client the picture it has to use
  * to smooth a picture number given as argument.
    * for the command that issued the count should be done before any other
    * 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
     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 (!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;
                                || 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;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.102 by root, Sun Jun 3 17:42:39 2007 UTC vs. Revision 1.110 by root, Sun Jul 1 03:16:56 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 03:16:56 2007 UTC