--- deliantra/server/socket/info.C	2007/04/30 04:25:30	1.40
+++ deliantra/server/socket/info.C	2007/05/28 21:22:26	1.43
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 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.
+ * Crossfire TRT 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.
+ * 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>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /**
@@ -152,25 +152,25 @@
  *
  */
 void
-new_draw_info (int flags, int pri, const object *pl, const char *buf)
+new_draw_info (int flags, int pri, const object *op, const char *buf)
 {
   if (flags & NDI_ALL)
     {
       for_all_players (pl)
         new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
-
-      return;
     }
+  else
+    {
+      if (!op || !op->contr || !op->contr->ns)
+        return;
 
-  if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns)
-    return;
-
-  if (pri >= pl->contr->listening)
-    return;
+      if (pri >= op->contr->listening)
+        return;
 
-  if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
-      || !pl->contr->ns->msg_suppressed (buf))
-    print_message (flags & NDI_COLOR_MASK, pl, buf);
+      if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
+          || !op->contr->ns->msg_suppressed (buf))
+        print_message (flags & NDI_COLOR_MASK, op, buf);
+    }
 }
 
 /**