--- deliantra/server/socket/lowlevel.C	2006/12/15 00:14:13	1.21
+++ deliantra/server/socket/lowlevel.C	2006/12/15 19:59:20	1.22
@@ -35,7 +35,6 @@
 using namespace std;
 
 #include <global.h>
-#include <newclient.h>
 #include <sproto.h>
 #include <cstdarg>
 
@@ -53,7 +52,7 @@
 #define SOCKET_TIMEOUT2 20
 
 void
-client_socket::flush ()
+client::flush ()
 {
 #ifdef __linux__
   // check time of last ack, and, if too old, kill connection
@@ -91,7 +90,7 @@
 }
 
 void
-client_socket::write_outputbuffer ()
+client::write_outputbuffer ()
 {
   while (outputbuffer.len)
     {
@@ -201,7 +200,7 @@
  ******************************************************************************/
 
 int
-client_socket::read_packet ()
+client::read_packet ()
 {
   for (;;)
     {
@@ -247,7 +246,7 @@
 }
 
 void
-client_socket::skip_packet (int len)
+client::skip_packet (int len)
 {
   inbuf_len -= len;
   memmove (inbuf, inbuf + len, inbuf_len);
@@ -266,7 +265,7 @@
  * data, and len is the number of bytes to add.
  */
 void
-client_socket::send (void *buf_, int len)
+client::send (void *buf_, int len)
 {
   char *buf = (char *)buf_;
   char *pos = buf;
@@ -310,7 +309,7 @@
 }
 
 void
-client_socket::socket_cb (iow &w, int got)
+client::socket_cb (iow &w, int got)
 {
   write_outputbuffer ();
 
@@ -323,7 +322,7 @@
  * shortcut function.
  */
 void
-client_socket::send_packet (packet &sl)
+client::send_packet (packet &sl)
 {
   if (status == Ns_Dead)
     return;
@@ -349,7 +348,7 @@
 }
 
 void
-client_socket::send_packet (const char *buf, int len)
+client::send_packet (const char *buf, int len)
 {
   packet sl;
 
@@ -358,7 +357,7 @@
 }
 
 void
-client_socket::send_packet (const char *buf)
+client::send_packet (const char *buf)
 {
   send_packet (buf, strlen (buf));
 }