[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.66 by root, Mon Oct 29 23:55:57 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero 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.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and 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 <support@deliantra.net>
  */
 /**
  * \file
 {
   ns->send_msg (color, "info", str);
 }
 /**
- * Draws   an extended message on the client.
- * ns      the socket to send message to
- * color   color informations (used mainly if client does not support message type)
- * type,
- * subtype type and subtype of text message
- * intro   Intro message to send with main message if client does not support the message type
- * message The main message
- */
-static void
-esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
-{
-  ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
-}
-/**
  * Frontend for esrv_print_msg
  * \param colr message color
  * \param pl player to send to. Can be NULL
  * \param tmp message to send. Can be NULL
  *
   for (msg_buf *buf = msgbuf; buf < msgbuf + MSG_BUF_COUNT; ++buf)
     {
       if (len == buf->len && !memcmp (msg, buf->msg, len))
         {
           // found matching buf, see if expired
-          if (buf->expire <= pticks || !buf->count)
+          if (buf->expire <= server_tick || !buf->count)
             {
               // yes, take over matching buffer, print
-              buf->expire = pticks + pl->outputs_sync;
+              buf->expire = server_tick + pl->outputs_sync;
               buf->count  = pl->outputs_count;
               return false;
             }
       if (lru->expire > buf->expire)
         lru = buf;
     }
   // new message, evoke oldest buffer
-  lru->expire = pticks + pl->outputs_sync;
+  lru->expire = server_tick + pl->outputs_sync;
   lru->count  = pl->outputs_count;
   lru->len    = len;
   memcpy (lru->msg, msg, len);
   return false;
  * 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)
-{
-  if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
-    return;
-  if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
-    {
-      char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
-      if (buf == NULL)
-        LOG (llevError, "info::draw_ext_info -> Out of memory!");
-      else
-        {
-          strcpy (buf, oldmessage == NULL ? message : oldmessage);
-          strip_media_tag (buf);
-          new_draw_info (flags, pri, pl, buf);
-          free (buf);
-        }
-    }
-  else
-    esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message);
-}
-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];
-  if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
-    return;
-  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);
-      return;
-    }
-  else
-    {
-      va_list 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);
-    }
 }
 /**
  * Writes to everyone on the map *except* op.  This is useful for emotions.
  */
 void
 new_info_map_except (int color, maptile * map, object *op, const char *str)
 {
   for_all_players (pl)
     if (pl->ob->map == map && pl->ob != op)
-      new_draw_info (color, 0, pl->ob, str);
-}
-/**
- * Writes to everyone on the map except op1 and op2
- */
-void
-new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
-{
-  for_all_players (pl)
-    if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
       new_draw_info (color, 0, pl->ob, str);
 }
 /**
  * Writes to everyone on the specified map
     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
+static 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)
  * Mark Wedel
  */
 void
 draw_magic_map (object *pl)
 {
-  char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
   int xmin, xmax, ymin, ymax;
   if (pl->type != PLAYER)
     {
       LOG (llevError, "Non player object called draw_map.\n");
       return;
     }
+  char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
+  assert(("Out of memory!", map_mark != NULL));
   /* First, we figure out what spaces are 'reachable' by the player */
   magic_mapping_mark (pl, map_mark, 3);
   /* We now go through and figure out what spaces have been

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.66 by root, Mon Oct 29 23:55:57 2012 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.66 by root, Mon Oct 29 23:55:57 2012 UTC