--- deliantra/server/include/client.h	2006/12/23 15:49:40	1.20
+++ deliantra/server/include/client.h	2006/12/25 11:25:49	1.21
@@ -164,8 +164,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
@@ -218,8 +218,8 @@
 
   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);