--- deliantra/server/socket/info.C	2006/09/19 10:21:58	1.10
+++ deliantra/server/socket/info.C	2006/12/13 21:27:09	1.13
@@ -98,10 +98,8 @@
 print_message (int colr, const object *pl, const char *tmp)
 {
 
-  if (tmp == (char *) NULL)
-    {
-      tmp = "[NULL]";
-    }
+  if (!tmp)
+    tmp = "[NULL]";
 
   if (!pl || (pl->type == PLAYER && pl->contr == NULL))
     return;
@@ -113,7 +111,6 @@
     }
 }
 
-
 /**
  * Prints out the contents of specified buffer structures,
  * and clears the string.
@@ -219,43 +216,31 @@
   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);
 
-      for (i = 1; i < socket_info.allocated_sockets; i++)
-        {
-          if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10)
-            {
-              cs_write_string (&init_sockets[i], buf, strlen (buf));
-              /* Most messages don't have a newline, so add one */
-              cs_write_string (&init_sockets[i], "\n", 1);
-            }
-        }
-
       return;
     }
+
   if (!pl || (pl->type == PLAYER && pl->contr == NULL))
     {
       /* 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);
-    }
+    /* following prints stuff out, as appropriate */
+    check_output_buffers (pl, buf);
   else
-    {
-      print_message (flags & NDI_COLOR_MASK, pl, buf);
-    }
+    print_message (flags & NDI_COLOR_MASK, pl, buf);
 }
 
 /**
@@ -622,10 +607,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)
     {
@@ -645,35 +628,29 @@
   ymin = MAGIC_MAP_SIZE;
   xmax = 0;
   ymax = 0;
-  for (x = 0; x < MAGIC_MAP_SIZE; x++)
-    {
-      for (y = 0; y < MAGIC_MAP_SIZE; y++)
-        {
-          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;
-            }
+
+  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)
+        {
+          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);
-
-  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 */
+  SockList sl (MAXSOCKBUF);
+  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);
 
   Send_With_Handling (&pl->contr->socket, &sl);
-  free (sl.buf);
+
+  sl.free ();
+
   free (map_mark);
 }
 
@@ -685,24 +662,13 @@
 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];
 
   if (With != NULL)
-    {
-      snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
-    }
+    snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
   else
-    {
-      snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
-    }
+    snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
+
   len = strlen (buf);
-  for (i = 1; i < socket_info.allocated_sockets; i++)
-    {
-      if (init_sockets[i].old_mode == Old_Listen)
-        {
-          cs_write_string (&init_sockets[i], buf, len);
-        }
-    }
 }