--- deliantra/server/socket/info.C	2007/04/30 04:25:30	1.40
+++ deliantra/server/socket/info.C	2007/06/24 04:09:29	1.45
@@ -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>
  */
 
 /**
@@ -38,6 +38,8 @@
 #include <spells.h>
 #include <skills.h>
 
+#include <cstring>
+
 /**
  * Draws a normal message on the client.  It is pretty 
  * much the same thing as the draw_info above, but takes a color
@@ -47,7 +49,7 @@
 static void
 esrv_print_msg (client *ns, int color, const char *str)
 {
-  ns->send_packet_printf ("drawinfo %d %s", color, str);
+  ns->send_msg (color, "info", str);
 }
 
 /**
@@ -62,7 +64,7 @@
 static void
 esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
 {
-  ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
+  ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
 }
 
 /**
@@ -85,7 +87,7 @@
     return;
 
   if (pl->type == PLAYER)
-    esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
+    esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
 }
 
 bool
@@ -152,25 +154,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);
+    }
 }
 
 /**
@@ -271,7 +273,6 @@
 /**
  * Writes to everyone on the map except op1 and op2
  */
-
 void
 new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
 {
@@ -283,7 +284,6 @@
 /**
  * Writes to everyone on the specified map
  */
-
 void
 new_info_map (int color, maptile * map, const char *str)
 {
@@ -293,16 +293,6 @@
 }
 
 /**
- * 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
- * to handle this
- */
-void
-clear_win_info (object *op)
-{
-}
-
-/**
  * Sets player title.
  */
 void