--- deliantra/server/socket/init.C	2010/04/08 19:31:22	1.66
+++ deliantra/server/socket/init.C	2018/12/01 20:22:13	1.78
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * 
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -130,28 +131,22 @@
     LOG (llevError, "InitConnection:  Error on fcntl.\n");
 
   state = ST_SETUP;
-  mapmode = Map1aCmd;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
-  max_rate = 200000 / (1000000 / MAX_TIME); // ~2mbit is assumed per default
+  max_rate = 100000 / (1000000 / MAX_TIME); // ~1mbit is assumed per default
 
   /* 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
-   * face information.
+   * this face. Face 0 is sent to the client to set meta data
+   * for following faces in fx.
    */
   faces_sent[0] = true;
-  fx_want [FT_FACE] = true; // all clients must support image faces
+  fx_want [FT_IMAGE] = true; // all clients must support image faces
 
   socket_ev.set (fd, EV_READ);
   socket_ev.prio (2); // one higher than the ticker priority
   socket_ev.start ();
 
-  // initialisation done, kick it!
-  INVOKE_CLIENT (CONNECT, this);
-
-  flush ();
-
   reset_stats ();
 
   clients.insert (this);
@@ -161,10 +156,23 @@
 {
   clients.erase (this);
 
+  while (!ixface.empty ())
+    ix_pop ();
+
   mapinfo_queue_clear ();
   free (stats.range);
   free (stats.title);
   free (host);
+  free (ws_inbuf);
+}
+
+void
+client::run ()
+{
+  // initialisation done, kick it!
+  INVOKE_CLIENT (CONNECT, this);
+
+  flush ();
 }
 
 void
@@ -199,23 +207,23 @@
    * send new values to the client, as things like exp start
    * at zero.
    */
-  for (int i = 0; i < NUM_SKILLS; i++)
+  for (int i = 0; i < ecb_array_length (last_skill_exp); i++)
     last_skill_exp[i] = -1;
 
-  for (int i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < ecb_array_length (last_resist); i++)
     last_resist[i] = -1;
 
-  last_weapon_sp = -1;
-  last_level = -1;
-  last_stats.exp = -1;
-  last_flags = 0;
-  last_weight = -1;
-  last_weight_limit = 0;
-  last_path_attuned = 0;
+  last_weapon_sp     = -1;
+  last_level         = -1;
+  last_stats.exp     = -1;
+  last_flags         = 0;
+  last_weight        = -1;
+  last_weight_limit  = 0;
+  last_path_attuned  = 0;
   last_path_repelled = 0;
-  last_path_denied = 0;
-  last_speed = 0;
-  last_flags = 0;
+  last_path_denied   = 0;
+  last_speed         = 0;
+  last_flags         = 0;
 
   static living zero_living;
   last_stats = zero_living;