[ViewVC] Diff of: cvs/deliantra/server/socket/lowlevel.C

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.47 by root, Tue Jun 12 10:29:52 2007 UTC vs.
Revision 1.48 by root, Sun Jun 24 04:09:29 2007 UTC

   va_end (ap);
   send_packet (sl);
 }
-void
+// returns true when the message needs special (read: perl) treatment
-client::send_drawinfo (const char *msg, int flags)
+static bool
-{
+msg_is_special (const char *msg)
-  send_packet_printf ("drawinfo %d %s", flags, msg);
+{
+  return msg [strcspn (msg, "<[&\n")];
 }
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
+  if (msg_is_special (msg))
+    cfperl_send_msg (this, color, type, msg);
-  if (can_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

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines