--- deliantra/server/socket/info.C	2006/12/14 01:21:58	1.15
+++ deliantra/server/socket/info.C	2006/12/26 10:42:47	1.26
@@ -45,16 +45,9 @@
  * replaced with this, just using black as the color.
  */
 static void
-esrv_print_msg (NewSocket * ns, int color, const char *str)
+esrv_print_msg (client *ns, int color, const char *str)
 {
-  packet sl;
-
-  if (ns->status == Ns_Old)
-    sl.printf ("%s\n", str);
-  else
-    sl.printf ("drawinfo %d %s", color, str);
-
-  ns->send_packet (sl);
+  ns->send_packet_printf ("drawinfo %d %s", color, str);
 }
 
 /**
@@ -67,12 +60,9 @@
  * message The main message
  */
 static void
-esrv_print_ext_msg (NewSocket * 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)
 {
-  packet sl;
-
-  sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
-  ns->send_packet (sl);
+  ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
 }
 
 /**
@@ -85,11 +75,9 @@
  *
  * 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]";
 
@@ -97,17 +85,13 @@
     return;
 
   if (pl->type == PLAYER)
-    {
-      esrv_print_msg (&pl->contr->socket, colr, (char *) tmp);
-      return;
-    }
+    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)
 {
@@ -141,7 +125,6 @@
  * 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)
 {
@@ -182,8 +165,6 @@
     }
 }
 
-
-
 /**
  * Sends message to player(s).
  *
@@ -204,12 +185,11 @@
 void
 new_draw_info (int flags, int pri, const object *pl, const char *buf)
 {
-
   if (flags & NDI_ALL)
     {
       player *tmppl;
 
-      for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
+      for_all_players (tmppl)
         new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
 
       return;
@@ -243,7 +223,6 @@
  * 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, ...)
 {
@@ -260,7 +239,6 @@
   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)
 {
@@ -270,7 +248,8 @@
 
   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);
 
@@ -285,9 +264,7 @@
         }
     }
   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
@@ -301,7 +278,8 @@
 
   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;
 
@@ -320,7 +298,7 @@
       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);
     }
 }
 
@@ -333,7 +311,7 @@
 {
   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);
@@ -349,7 +327,7 @@
 {
   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);
@@ -365,7 +343,7 @@
 {
   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);
@@ -586,7 +564,6 @@
     }
 }
 
-
 /**
  * Creates and sends magic map to player.
  *
@@ -623,7 +600,7 @@
 
   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;
@@ -639,17 +616,14 @@
     for (int x = xmin; x <= xmax; x++)
       sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR);
 
-  Send_With_Handling (&pl->contr->socket, &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)
 {
@@ -663,3 +637,4 @@
 
   len = strlen (buf);
 }
+