--- deliantra/server/socket/info.C	2006/12/26 17:11:40	1.27
+++ deliantra/server/socket/info.C	2007/03/01 12:28:17	1.34
@@ -1,26 +1,26 @@
-
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ */
 
 /**
  * \file
@@ -193,21 +193,13 @@
       return;
     }
 
-  if (!pl || (pl->type == PLAYER && pl->contr == NULL))
-    {
-      /* Write to the socket? */
-      print_message (0, NULL, buf);
-      return;
-    }
-
-  if (pl->type != PLAYER)
+  if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
     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);
   else
     print_message (flags & NDI_COLOR_MASK, pl, buf);
@@ -227,11 +219,8 @@
   char buf[HUGE_BUF];
 
   va_list ap;
-
   va_start (ap, format);
-
   vsnprintf (buf, HUGE_BUF, format, ap);
-
   va_end (ap);
 
   new_draw_info (flags, pri, pl, buf);
@@ -268,7 +257,6 @@
 void
 draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...)
 {
-
   char buf[HUGE_BUF];
 
   if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
@@ -307,13 +295,9 @@
 void
 new_info_map_except (int color, maptile * map, object *op, const char *str)
 {
-  player *pl;
-
   for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
-      {
-        new_draw_info (color, 0, pl->ob, str);
-      }
+      new_draw_info (color, 0, pl->ob, str);
 }
 
 /**
@@ -323,13 +307,9 @@
 void
 new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
 {
-  player *pl;
-
   for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
-      {
-        new_draw_info (color, 0, pl->ob, str);
-      }
+      new_draw_info (color, 0, pl->ob, str);
 }
 
 /**
@@ -339,16 +319,11 @@
 void
 new_info_map (int color, maptile * map, const char *str)
 {
-  player *pl;
-
   for_all_players (pl)
     if (pl->ob != NULL && pl->ob->map == map)
-      {
-        new_draw_info (color, 0, pl->ob, str);
-      }
+      new_draw_info (color, 0, pl->ob, str);
 }
 
-
 /**
  * This does nothing now.  However, in theory, we should probably send
  * something to the client and let the client figure out how it might want
@@ -464,7 +439,7 @@
   int x, y, dx, dy, mflags;
   sint16 nx, ny;
   maptile *mp;
-  New_Face *f;
+  facetile *f;
 
   for (dx = -1; dx <= 1; dx++)
     {
@@ -518,7 +493,7 @@
  *
  * This function examines the map the player is on, and determines what
  * is visible.  2 is set for walls or objects that blocks view.  1
- * is for open spaces.  map_mark should already have been initialized
+ * is for open spaces.  map_mark should already have been initialised
  * to zero before this is called.
  * strength is an initial strength*2 rectangular area that we automatically
  * see in/penetrate through.
@@ -530,7 +505,7 @@
   int x, y, mflags;
   sint16 nx, ny;
   maptile *mp;
-  New_Face *f;
+  facetile *f;
 
   for (x = -strength; x < strength; x++)
     {
@@ -570,7 +545,6 @@
  *
  * Mark Wedel
  */
-
 void
 draw_magic_map (object *pl)
 {