--- deliantra/server/include/client.h	2006/12/25 11:25:49	1.21
+++ deliantra/server/include/client.h	2006/12/26 05:44:14	1.22
@@ -216,8 +216,6 @@
 
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
 
-  client (int fd, const char *from_ip);
-  ~client ();
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
@@ -237,16 +235,16 @@
   void execute (const packet_type *pkt, char *data, int datalen);
 
   void queue_command (packet_type *handler, char *data, int datalen);
-  bool handle_command ();
+  MTH bool handle_command ();
   // resets movement state
-  void reset_state ();
+  MTH void reset_state ();
 
-  bool handle_packet ();
+  MTH bool handle_packet ();
   int next_packet ();                     // returns length of packet or 0
   void skip_packet (int len);             // we have processed the packet, skip it
 
-  void flush ();
-  void write_outputbuffer ();
+  MTH void flush ();
+  MTH void write_outputbuffer ();
   void send (void *buf_, int len);
 
   void send_packet (const char *buf);
@@ -255,11 +253,15 @@
   void send_packet (packet &sl);
 
   // called when something under the player changes
-  void floorbox_update () { update_look = 1; }
+  MTH void floorbox_update () { update_look = 1; }
   // called when the player has been moved
-  void floorbox_reset  () { look_position = 0; floorbox_update (); }
+  MTH void floorbox_reset  () { look_position = 0; floorbox_update (); }
+
+  MTH static client *create (int fd, const char *peername);
 
-  static client *create (int fd, const char *peername);
+protected:
+  client (int fd, const char *from_ip);
+  ~client ();
 };
 
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\