--- deliantra/server/socket/lowlevel.C 2008/09/19 01:39:45 1.66 +++ deliantra/server/socket/lowlevel.C 2009/02/21 06:25:46 1.70 @@ -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 @@ -218,9 +215,11 @@ len -= 6; } - if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; - if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; - if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; + if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; + if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; + if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; + if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; + if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true; if (len == 7 && !strcmp (data, "suicide")) return true; @@ -491,12 +490,8 @@ && (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); - else if (color < 0) - return; // client cannot handle this else - send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg); + send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); } void