--- deliantra/server/include/client.h	2006/12/23 15:49:40	1.20
+++ deliantra/server/include/client.h	2007/01/06 14:42:30	1.23
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for the X Window System
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -164,8 +165,8 @@
 /* how many times we are allowed to give the wrong password before being kicked. */
 #define MAX_PASSWORD_FAILURES 5
 
-ACC_CLASS (client) // should become player when newsocket is a baseclass of player
-struct client : zero_initialised, attachable<client>
+INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
+struct client : zero_initialised, attachable
 {
   int ACC (RW, fd);
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
@@ -216,10 +217,8 @@
 
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
 
-  client (int fd, const char *from_ip);
-  ~client ();
-  void destroy ();
-  bool destroyed () const { return state == ST_DEAD; }
+  void do_destroy ();
+  void gather_callbacks (AV *&callbacks, event_type event) const;
 
   iw  cmd_ev;    void cmd_cb (iw &w);
   iow socket_ev; void socket_cb (iow &w, int got);
@@ -237,16 +236,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 +254,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)\