--- deliantra/server/socket/init.C	2006/12/17 19:14:00	1.25
+++ deliantra/server/socket/init.C	2007/01/08 18:18:36	1.35
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -32,7 +33,6 @@
  * The reading of data is handled in ericserver.c
  */
 
-
 #include <global.h>
 #include <sproto.h>
 #include <sys/types.h>
@@ -46,6 +46,8 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include <algorithm>
+
 sockvec clients;
 
 /**
@@ -56,8 +58,11 @@
 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)
 {
+  refcnt_inc (); // the socket is an external reference
+
   {
     struct linger linger_opt;
 
@@ -120,14 +125,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
@@ -149,20 +154,14 @@
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
   flush ();
 
-#if 0//TODO
-  socket_info.nconns++;
-  if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
-  if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
-#endif
+  reset_stats ();
+
+  clients.insert (this);
 }
 
 client::~client ()
 {
-  if (pl)
-    pl->socket = 0;
-
-  if (fd >= 0)
-    close (fd);
+  clients.erase (this);
 
   sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
@@ -171,11 +170,58 @@
 }
 
 void
-client::destroy ()
+client::do_destroy ()
 {
-  status = Ns_Dead;
+  attachable::do_destroy ();
+
+  if (pl)
+    pl->disconnect ();
+
+  if (fd >= 0)
+    {
+      send_packet ("goodbye");
+      flush ();
+
+      close (fd);
+    }
+
+  state = ST_DEAD;
+
   socket_ev.suspend ();
   cmd_ev.suspend ();
+
+  refcnt_dec (); // socket no longer open
+}
+
+void
+client::reset_stats ()
+{
+  /* we need to clear these to -1 and not zero - otherwise,
+   * if a player quits and starts a new character, we wont
+   * send new values to the client, as things like exp start
+   * at zero.
+   */
+  for (int i = 0; i < NUM_SKILLS; i++)
+    last_skill_exp[i] = -1;
+
+  for (int i = 0; i < NROFATTACKS; i++)
+    last_resist[i] = -1;
+
+  last_weapon_sp = -1;
+  last_level = -1;
+  last_stats.exp = -1;
+  last_weight = (uint32) - 1;
+  last_flags = 0;
+  last_weight = 0;
+  last_weight_limit = 0;
+  last_path_attuned = 0;
+  last_path_repelled = 0;
+  last_path_denied = 0;
+  last_speed = 0;
+  flags = 0;
+
+  static living zero_living;
+  last_stats = zero_living;
 }
 
 /** This sets up the socket and reads all the image information into memory. */
@@ -205,26 +251,23 @@
   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;
     }
 }