--- deliantra/server/socket/lowlevel.C	2007/06/12 10:29:52	1.47
+++ deliantra/server/socket/lowlevel.C	2007/07/01 05:00:20	1.49
@@ -1,22 +1,21 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * 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.
+ * 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 3 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -513,28 +512,32 @@
   send_packet (sl);
 }
 
-void
-client::send_drawinfo (const char *msg, int flags)
-{
-  send_packet_printf ("drawinfo %d %s", flags, msg);
+// returns true when the message needs special (read: perl) treatment
+static bool
+msg_is_special (const char *msg)
+{   
+  return msg [strcspn (msg, "<[&\n")];
 }
 
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
-  if (can_msg)
+  if (msg_is_special (msg))
+    cfperl_send_msg (this, color, type, msg);
+  else if (can_msg)
     send_packet_printf ("msg %d %s %s", color, type, msg);
   else if (color < 0)
     return; // client cannot handle this
-  else if (strchr (msg, '<') || strchr (msg, '&'))
-    {
-      //TODO: should escape/modify to old syntax
-      send_packet_printf ("drawinfo %d %s", color, msg);
-    }
   else
     send_packet_printf ("drawinfo %d %s", color, msg);
 }
 
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+  send_msg (flags, "log", msg);
+}
+
 /***********************************************************************
  *
  * packet functions/utilities