--- deliantra/server/socket/info.C	2006/12/13 21:27:09	1.13
+++ deliantra/server/socket/info.C	2006/12/15 19:59:20	1.20
@@ -45,21 +45,11 @@
  * 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)
 {
-  char buf[HUGE_BUF];
-
-  if (ns->status == Ns_Old)
-    {
-      snprintf (buf, HUGE_BUF, "%s\n", str);
-    }
-  else
-    {
-      snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
-    }
-
-/*    LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/
-  Write_String_To_Socket (ns, buf, strlen (buf));
+  packet sl;
+  sl.printf ("drawinfo %d %s", color, str);
+  ns->send_packet (sl);
 }
 
 /**
@@ -72,15 +62,12 @@
  * 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)
 {
-  char buf[HUGE_BUF];
-
-  snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
-  Write_String_To_Socket (ns, buf, strlen (buf));
-
-/*    LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/
+  packet sl;
 
+  sl.printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
+  ns->send_packet (sl);
 }
 
 /**
@@ -105,10 +92,7 @@
     return;
 
   if (pl->type == PLAYER)
-    {
-      esrv_print_msg (&pl->contr->socket, colr, (char *) tmp);
-      return;
-    }
+    esrv_print_msg (pl->contr->socket, colr, (char *) tmp);
 }
 
 /**
@@ -278,7 +262,8 @@
 
   if (pri >= pl->contr->listening)
     return;
-  if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
+
+  if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
     {
       char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
 
@@ -293,9 +278,7 @@
         }
     }
   else
-    {
-      esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
-    }
+    esrv_print_ext_msg (pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message);
 }
 
 void
@@ -309,7 +292,8 @@
 
   if (pri >= pl->contr->listening)
     return;
-  if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type))
+
+  if (!CLIENT_SUPPORT_READABLES (pl->contr->socket, type))
     {
       va_list ap;
 
@@ -328,7 +312,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->socket, flags & NDI_COLOR_MASK, type, subtype, buf);
     }
 }
 
@@ -639,7 +623,7 @@
           ymax = y > ymax ? y : ymax;
         }
 
-  SockList sl (MAXSOCKBUF);
+  packet sl;
   sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
              MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
 
@@ -647,9 +631,7 @@
     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);
-
-  sl.free ();
+  pl->contr->socket->send_packet (sl);
 
   free (map_mark);
 }