--- deliantra/server/socket/info.C	2006/12/14 02:37:37	1.16
+++ deliantra/server/socket/info.C	2006/12/14 04:30:33	1.17
@@ -97,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);
 }
 
 /**
@@ -270,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);
 
@@ -285,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
@@ -301,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;
 
@@ -320,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);
     }
 }
 
@@ -639,8 +636,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);
-
+  Send_With_Handling (pl->contr->socket, &sl);
 
   free (map_mark);
 }