--- deliantra/server/socket/info.C	2006/09/20 21:53:50	1.11
+++ deliantra/server/socket/info.C	2006/12/14 04:30:33	1.17
@@ -45,21 +45,16 @@
  * 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_socket * ns, int color, const char *str)
 {
-  char buf[HUGE_BUF];
+  packet sl;
 
   if (ns->status == Ns_Old)
-    {
-      snprintf (buf, HUGE_BUF, "%s\n", str);
-    }
+    sl.printf ("%s\n", str);
   else
-    {
-      snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str);
-    }
+    sl.printf ("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));
+  ns->send_packet (sl);
 }
 
 /**
@@ -72,15 +67,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_socket * 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 +97,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);
 }
 
 /**
@@ -216,7 +205,6 @@
   if (flags & NDI_ALL)
     {
       player *tmppl;
-      int i;
 
       for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next)
         new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf);
@@ -279,7 +267,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);
 
@@ -294,9 +283,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
@@ -310,7 +297,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;
 
@@ -329,7 +317,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);
     }
 }
 
@@ -608,10 +596,8 @@
 void
 draw_magic_map (object *pl)
 {
-  int x, y;
-  char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
+  char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1);
   int xmin, xmax, ymin, ymax;
-  SockList sl;
 
   if (pl->type != PLAYER)
     {
@@ -631,35 +617,27 @@
   ymin = MAGIC_MAP_SIZE;
   xmax = 0;
   ymax = 0;
-  for (x = 0; x < MAGIC_MAP_SIZE; x++)
-    {
-      for (y = 0; y < MAGIC_MAP_SIZE; y++)
+
+  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 + MAP_WIDTH (pl->map) * y] | FACE_FLOOR)
-            {
-              xmin = x < xmin ? x : xmin;
-              xmax = x > xmax ? x : xmax;
-              ymin = y < ymin ? y : ymin;
-              ymax = y > ymax ? y : ymax;
-            }
+          xmin = x < xmin ? x : xmin;
+          xmax = x > xmax ? x : xmax;
+          ymin = y < ymin ? y : ymin;
+          ymax = y > ymax ? y : ymax;
         }
-    }
 
-  sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
-  snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
-            MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
-  sl.len = strlen ((char *) sl.buf);
+  packet sl;
+  sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1),
+             MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin);
+
+  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);
 
-  for (y = ymin; y <= ymax; y++)
-    {
-      for (x = xmin; x <= xmax; x++)
-        {
-          sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR;
-        }                       /* x loop */
-    }                           /* y loop */
+  Send_With_Handling (pl->contr->socket, &sl);
 
-  Send_With_Handling (&pl->contr->socket, &sl);
-  free (sl.buf);
   free (map_mark);
 }
 
@@ -671,7 +649,6 @@
 void
 Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
 {
-  int i;
   size_t len;
   char buf[MAX_BUF];