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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.52 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC

  * client/server bandwidth (client could keep track of various strings
  */
 void
 new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...)
 {
-  char buf[HUGE_BUF];
   va_list ap;
   va_start (ap, format);
-  vsnprintf (buf, HUGE_BUF, format, ap);
+  new_draw_info (flags, pri, pl, vformat (format, ap));
   va_end (ap);
-  new_draw_info (flags, pri, pl, buf);
 }
 void
 draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
 {
 }
 void
 draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
 {
-  char buf[HUGE_BUF];
+  va_list ap;
+  va_start (ap, new_format);
-  if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
+  if (!pl || !pl->is_player ())
     return;
+  // TODO: just assume, and rip out?
   if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
     {
-      va_list ap;
       LOG (llevDebug, "Non supported extension text type for client.\n");
-      va_start (ap, new_format);
-      vsnprintf (buf, HUGE_BUF, old_format, ap);
-      va_end (ap);
-      new_draw_info (flags, pri, pl, buf);
+      new_draw_info (flags, pri, pl, vformat (old_format, ap));
-      return;
     }
   else
     {
-      va_list ap;
+      char *buf = vformat (new_format, ap);
-      va_start (ap, new_format);
-      vsnprintf (buf, HUGE_BUF, new_format, ap);
-      va_end (ap);
       strip_media_tag (buf);
       esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf);
     }
+  va_end (ap);
 }
 /**
  * Writes to everyone on the map *except* op.  This is useful for emotions.
  */
     sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title);
 }
 // formerly a macro, used only by magic map, so optimised it out
 static inline faceidx
-GET_MAP_FACE (maptile *m, int x, int y, int layer)
+GET_MAP_FACE (mapspace &ms, int layer)
 {
-  if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer))
+  if (object *op = ms.faces_obj [layer])
     return op->face;
   else
     return 0;
 }
  * for various code values.
  */
 static void
 magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
 {
-  int x, y, dx, dy, mflags;
-  sint16 nx, ny;
-  maptile *mp;
-  for (dx = -1; dx <= 1; dx++)
+  for (int dx = -1; dx <= 1; dx++)
     {
-      for (dy = -1; dy <= 1; dy++)
+      for (int dy = -1; dy <= 1; dy++)
         {
-          x = px + dx;
+          int x = px + dx;
-          y = py + dy;
+          int y = py + dy;
-          if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF)
+          if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF)
             continue;
-          mp = pl->map;
+          mapxy pos (pl);
-          nx = pl->x + x;
+          pos.move (x, y);
-          ny = pl->y + y;
-          mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
+          if (!pos.normalise ())
-          if (mflags & P_OUT_OF_MAP)
             continue;
+          mapspace &ms = pos.ms ();
           if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0)
             {
+              int mflags = ms.flags ();
-              int f = GET_MAP_FACE (mp, nx, ny, 0);
+              int f = GET_MAP_FACE (ms, 0);
               if (f == blank_face)
                 {
-                  f = GET_MAP_FACE (mp, nx, ny, 1);
+                  f = GET_MAP_FACE (ms, 1);
                   if (f == blank_face)
-                    f = GET_MAP_FACE (mp, nx, ny, 2);
+                    f = GET_MAP_FACE (ms, 2);
                 }
               int magicmap = faces [f].magicmap;
               /* Should probably have P_NO_MAGIC here also, but then shops don't
 }
 /**
  * Creates magic map for player.
  *
- * Note:  For improved magic mapping display, the space that blocks
+ * Note: For improved magic mapping display, the space that blocks
- * the view is now marked with value 2.  Any dependencies of map_mark
+ * the view is now marked with value 2. Any dependencies of map_mark
- * being nonzero have been changed to check for 1.  Also, since
+ * being nonzero have been changed to check for 1. Also, since
  * map_mark is a char value, putting 2 in should cause no problems.
  *
  * This function examines the map the player is on, and determines what
- * is visible.  2 is set for walls or objects that blocks view.  1
+ * is visible. 2 is set for walls or objects that blocks view. 1
- * is for open spaces.  map_mark should already have been initialised
+ * is for open spaces. map_mark should already have been initialised
  * to zero before this is called.
  * strength is an initial strength*2 rectangular area that we automatically
  * see in/penetrate through.
  */
 void
 magic_mapping_mark (object *pl, char *map_mark, int strength)
 {
-  int x, y, mflags;
-  sint16 nx, ny;
-  maptile *mp;
-  for (x = -strength; x < strength; x++)
+  for (int x = -strength; x < strength; x++)
     {
-      for (y = -strength; y < strength; y++)
+      for (int y = -strength; y < strength; y++)
         {
-          mp = pl->map;
+          mapxy pos (pl);
-          nx = pl->x + x;
+          pos.move (x, y);
-          ny = pl->y + y;
-          mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny);
+          if (!pos.normalise ())
-          if (mflags & P_OUT_OF_MAP)
             continue;
+          mapspace &ms = pos.ms ();
+          int mflags = ms.flags ();
-          int f = GET_MAP_FACE (mp, nx, ny, 0);
+          int f = GET_MAP_FACE (ms, 0);
           if (f == blank_face)
             {
-              f = GET_MAP_FACE (mp, nx, ny, 1);
+              f = GET_MAP_FACE (ms, 1);
               if (f == blank_face)
-                f = GET_MAP_FACE (mp, nx, ny, 2);
+                f = GET_MAP_FACE (ms, 2);
             }
           int magicmap = faces [f].magicmap;
           if (mflags & P_BLOCKSVIEW)

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.52 by root, Mon Oct 12 14:00:59 2009 UTC vs. Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.52 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.54 by root, Wed Nov 4 14:45:30 2009 UTC