--- deliantra/server/socket/lowlevel.C 2007/07/28 00:15:18 1.52 +++ deliantra/server/socket/lowlevel.C 2007/07/28 12:02:58 1.53 @@ -64,7 +64,7 @@ if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) { - send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); + send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); write_outputbuffer (); LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, @@ -166,7 +166,7 @@ if (inbuf_len == sizeof (inbuf)) { - send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); + send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY); destroy (); return -1; } @@ -270,7 +270,7 @@ ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); } else - send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); + send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); } bool @@ -321,7 +321,7 @@ } // If we get here, we didn't find a valid command. - send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); + send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); next_packet: skip_packet (pkt_len); @@ -524,11 +524,11 @@ 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); + 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, msg); + send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg); } void