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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.21 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.32 by root, Fri Jan 19 17:50:11 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
  * much the same thing as the draw_info above, but takes a color
  * parameter.  the esrv_drawinfo functions should probably be
  * replaced with this, just using black as the color.
  */
 static void
-esrv_print_msg (client * ns, int color, const char *str)
+esrv_print_msg (client *ns, int color, const char *str)
 {
   ns->send_packet_printf ("drawinfo %d %s", color, str);
 }
 /**
  * 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)
+esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
 {
   ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
 }
 /**
  *
  * If pl is NULL or without contr set, writes message to log.
  *
  * Else sends message to player via esrv_print_msg
  */
 static void
 print_message (int colr, const object *pl, const char *tmp)
 {
   if (!tmp)
     tmp = "[NULL]";
   if (!pl || (pl->type == PLAYER && pl->contr == NULL))
     return;
   if (pl->type == PLAYER)
-    esrv_print_msg (pl->contr->socket, colr, (char *) tmp);
+    esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
 }
 /**
  * Prints out the contents of specified buffer structures,
  * and clears the string.
  */
 void
 flush_output_element (const object *pl, Output_Buf * outputs)
 {
   char tbuf[MAX_BUF];
  * If found, checks if message should be sent now.
  *
  * If message not already in buffers, flushes olders buffer,
  * and adds message to queue.
  */
 static void
 check_output_buffers (const object *pl, const char *buf)
 {
   int i, oldest = 0;
           pl->contr->outputs[oldest].buf = buf;
         }
     }
 }
 /**
  * Sends message to player(s).
  *
  * flags is various flags - mostly color, plus a few specials.
  *
  */
 void
 new_draw_info (int flags, int pri, const object *pl, const char *buf)
 {
   if (flags & NDI_ALL)
     {
-      player *tmppl;
+      for_all_players (pl)
-      for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
-        new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
+        new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
       return;
     }
-  if (!pl || (pl->type == PLAYER && pl->contr == NULL))
+  if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
-    {
-      /* Write to the socket? */
-      print_message (0, NULL, buf);
-      return;
-    }
-  if (pl->type != PLAYER)
     return;
   if (pri >= pl->contr->listening)
     return;
   if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE))
-    /* following prints stuff out, as appropriate */
     check_output_buffers (pl, buf);
   else
     print_message (flags & NDI_COLOR_MASK, pl, buf);
 }
  * This is a pretty trivial function, but it allows us to use printf style
  * formatting, so instead of the calling function having to do it, we do
  * it here.  It may also have advantages in the future for reduction of
  * 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);
   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 (pri >= pl->contr->listening)
     return;
-  if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
+  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!");
           new_draw_info (flags, pri, pl, buf);
           free (buf);
         }
     }
   else
-    esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
+    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 (pri >= pl->contr->listening)
     return;
-  if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
+  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);
       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->socket, flags & NDI_COLOR_MASK, type, subtype, 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)
 {
   player *pl;
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
-      {
-        new_draw_info (color, 0, pl->ob, str);
+      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)
 {
   player *pl;
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
-      {
-        new_draw_info (color, 0, pl->ob, str);
+      new_draw_info (color, 0, pl->ob, str);
-      }
 }
 /**
  * Writes to everyone on the specified map
  */
 void
 new_info_map (int color, maptile * map, const char *str)
 {
   player *pl;
-  for (pl = first_player; pl != NULL; pl = pl->next)
+  for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map)
-      {
-        new_draw_info (color, 0, pl->ob, str);
+      new_draw_info (color, 0, pl->ob, str);
-      }
 }
 /**
  * This does nothing now.  However, in theory, we should probably send
  * something to the client and let the client figure out how it might want
  * to handle this
 magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py)
 {
   int x, y, dx, dy, mflags;
   sint16 nx, ny;
   maptile *mp;
-  New_Face *f;
+  facetile *f;
   for (dx = -1; dx <= 1; dx++)
     {
       for (dy = -1; dy <= 1; dy++)
         {
  * 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 for open spaces.  map_mark should already have been initialized
+ * 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.
  */
 magic_mapping_mark (object *pl, char *map_mark, int strength)
 {
   int x, y, mflags;
   sint16 nx, ny;
   maptile *mp;
-  New_Face *f;
+  facetile *f;
   for (x = -strength; x < strength; x++)
     {
       for (y = -strength; y < strength; y++)
         {
             }
         }
     }
 }
 /**
  * Creates and sends magic map to player.
  *
  * The following function is a lot messier than it really should be,
  * but there is no real easy solution.
  *
  * 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;
   xmax = 0;
   ymax = 0;
   for (int x = 0; x < MAGIC_MAP_SIZE; x++)
     for (int y = 0; y < MAGIC_MAP_SIZE; y++)
-      if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
+      if (map_mark[x + pl->map->width * y] | FACE_FLOOR)
         {
           xmin = x < xmin ? x : xmin;
           xmax = x > xmax ? x : xmax;
           ymin = y < ymin ? y : ymin;
           ymax = y > ymax ? y : ymax;
   for (int y = ymin; y <= ymax; y++)
     for (int x = xmin; x <= xmax; x++)
       sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet (sl);
   free (map_mark);
 }
 /**
  * Send a kill log record to sockets
  */
 void
 Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
 {
   size_t len;
   char buf[MAX_BUF];
   else
     snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
   len = strlen (buf);
 }

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.21 by root, Sat Dec 16 03:08:26 2006 UTC vs. Revision 1.32 by root, Fri Jan 19 17:50:11 2007 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.21 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.32 by root, Fri Jan 19 17:50:11 2007 UTC