--- deliantra/server/socket/lowlevel.C	2007/11/08 19:43:30	1.62
+++ deliantra/server/socket/lowlevel.C	2008/12/27 01:25:00	1.68
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify
@@ -64,7 +64,7 @@
         return;
     }
 
-  if (socket_ev.poll () & PE_W)
+  if (socket_ev.poll () & EV_WRITE)
     return;
 
   last_send = NOW;
@@ -101,7 +101,7 @@
       else if (errno == EAGAIN)
         {
           // delay till ready
-          socket_ev.poll (socket_ev.poll () | PE_W);
+          socket_ev.poll (socket_ev.poll () | EV_WRITE);
           socket_ev.start ();
           return;
         }
@@ -113,7 +113,7 @@
         }
     }
 
-  socket_ev.poll (socket_ev.poll () & ~PE_W);
+  socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
 }
 
 /******************************************************************************
@@ -182,13 +182,10 @@
   {"addme",       SC(AddMeCmd)     0 },
   {"askface",     SC(AskFaceCmd)   0 },
   {"requestinfo", SC(RequestInfo)  0 },
-  {"setfacemode", SC(SetFaceMode)  0 },
   {"setsound",    SC(SetSound)     0 },
   {"setup",       SC(SetUp)        0 },
   {"version",     SC(VersionCmd)   0 },
-  {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
   {"toggleextendedtext",  SC(ToggleExtendedText)  0 },   /*Added: tchize */
-  {"asksmooth",   SC(AskSmooth)    0 },     /*Added: tchize (smoothing technologies) */
 };
 
 bool
@@ -295,14 +292,14 @@
   skip_packet (pkt_len);
 
   // input buffer has space again
-  socket_ev.poll (socket_ev.poll () | PE_R);
+  socket_ev.poll (socket_ev.poll () | EV_READ);
 
   return true;
 }
 
 // callback called when socket is either readable or writable
 void
-client::socket_cb (iow &w, int got)
+client::socket_cb (iow &w, int revents)
 {
   //TODO remove when we have better socket cleanup logic
   if (destroyed ())
@@ -311,15 +308,15 @@
       return;
     }
 
-  if (got & PE_W)
+  if (revents & EV_WRITE)
     {
       write_outputbuffer ();
 
       if (!outputbuffer.len)
-        socket_ev.poll (socket_ev.poll () & ~PE_W);
+        socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
     }
 
-  if (got & PE_R)
+  if (revents & EV_READ)
     {
       //TODO: rate-limit tcp connection in better ways, important
 
@@ -328,7 +325,7 @@
       if (!amount)
         {
           // input buffer full
-          socket_ev.poll (socket_ev.poll () & ~PE_R);
+          socket_ev.poll (socket_ev.poll () & ~EV_READ);
           return;
         }
 
@@ -476,13 +473,6 @@
   send_packet (sl);
 }
 
-// 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)
 {
@@ -494,7 +484,9 @@
 
   int len = strlen (msg);
 
-  if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
+  if (!(color & NDI_VERBATIM)
+      && (msg_is_special (msg)
+          || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
     cfperl_send_msg (this, color, type, msg);
   else if (can_msg)
     send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);