--- deliantra/server/socket/init.C	2006/12/17 19:07:23	1.24
+++ deliantra/server/socket/init.C	2006/12/22 16:34:00	1.30
@@ -32,7 +32,6 @@
  * The reading of data is handled in ericserver.c
  */
 
-
 #include <global.h>
 #include <sproto.h>
 #include <sys/types.h>
@@ -56,7 +55,8 @@
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
   socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb)
+  cmd_ev    (this, &client::cmd_cb),
+  cc_inv (this), cc_other (this)
 {
   {
     struct linger linger_opt;
@@ -120,14 +120,14 @@
     getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
   }
 
+  state = ST_SETUP;
   mapmode = Map0Cmd;
   darkness = 1;
-  status = Ns_Add;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
 
-  faces_sent = salloc<uint8> (nrofpixmaps, 0);
+  faces_sent = salloc0<uint8> (nrofpixmaps);
 
   /* Do this so we don't send a face command for the client for
    * this face.  Face 0 is sent to the client to say clear
@@ -159,12 +159,18 @@
 client::~client ()
 {
   if (pl)
-    pl->socket = 0;
+    {
+      pl->save ();
+      leave (pl, 1);
+      pl->ns = 0;
+
+      delete pl;
+    }
 
   if (fd >= 0)
     close (fd);
 
-  sfree<uint8> (faces_sent);
+  sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
   free (stats.title);
   free (host);
@@ -173,7 +179,10 @@
 void
 client::destroy ()
 {
-  status = Ns_Dead;
+  INVOKE_CLIENT (DESTROY, this);
+
+  state = ST_DEAD;
+
   socket_ev.suspend ();
   cmd_ev.suspend ();
 }
@@ -205,26 +214,24 @@
   free_socket_images ();
 }
 
-/** Sends the 'goodbye' command to the player, and closes connection. */
-void
-final_free_player (player *pl)
-{
-  free_player (pl);
-}
-
-bool
-add_client (int fd, const char *peername)
+client *
+client::create (int fd, const char *peername)
 {
   if (checkbanned (NULL, peername))
     {
       LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
-      return false;
+      return 0;
     }
   else
     {
       client *ns = new client (dup (fd), peername);
       clients.push_back (ns);
-      return true;
+
+      ns->instantiate (); // effectively a nop right now
+
+      INVOKE_CLIENT (CONNECT, ns);
+
+      return ns;
     }
 }