--- deliantra/server/socket/info.C	2006/12/14 20:39:54	1.19
+++ deliantra/server/socket/info.C	2006/12/21 06:12:37	1.22
@@ -45,11 +45,9 @@
  * replaced with this, just using black as the color.
  */
 static void
-esrv_print_msg (client_socket * ns, int color, const char *str)
+esrv_print_msg (client *ns, int color, const char *str)
 {
-  packet sl;
-  sl.printf ("drawinfo %d %s", color, str);
-  ns->send_packet (sl);
+  ns->send_packet_printf ("drawinfo %d %s", color, str);
 }
 
 /**
@@ -62,12 +60,9 @@
  * message The main message
  */
 static void
-esrv_print_ext_msg (client_socket * 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);
 }
 
 /**
@@ -80,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]";
 
@@ -99,7 +92,6 @@
  * Prints out the contents of specified buffer structures,
  * and clears the string.
  */
-
 void
 flush_output_element (const object *pl, Output_Buf * outputs)
 {
@@ -133,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)
 {
@@ -174,8 +165,6 @@
     }
 }
 
-
-
 /**
  * Sends message to player(s).
  *
@@ -196,7 +185,6 @@
 void
 new_draw_info (int flags, int pri, const object *pl, const char *buf)
 {
-
   if (flags & NDI_ALL)
     {
       player *tmppl;
@@ -235,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, ...)
 {
@@ -252,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)
 {
@@ -578,7 +564,6 @@
     }
 }
 
-
 /**
  * Creates and sends magic map to player.
  *
@@ -636,11 +621,9 @@
   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)
 {
@@ -654,3 +637,4 @@
 
   len = strlen (buf);
 }
+