--- deliantra/server/include/client.h	2006/12/20 01:19:11	1.12
+++ deliantra/server/include/client.h	2006/12/21 06:12:36	1.14
@@ -26,7 +26,7 @@
 
 #include <deque>
 #include <bitset>
-#include <list>
+#include <tr1/unordered_set>
 
 // (possibly) max. number of objects "per page" in the ground container
 #define FLOORBOX_PAGESIZE 50
@@ -70,15 +70,13 @@
  * are using.
  */
 
-enum Sock_Status { Ns_Add, Ns_Dead };
-
 /* Only one map mode can actually be used, so lets make it a switch
  * instead of having a bunch of different fields that needed to
  * get toggled.
  */
 enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
 
-/* The following is the setup for a ring buffer for storing outbut
+/* The following is the setup for a ring buffer for storing output
  * data that the OS can't handle right away.
  */
 
@@ -115,29 +113,49 @@
   }
 };
 
+struct refitem
+{
+  object_ptr op;
+};
+
 // this represents a container on the client side.
 // right now, there are only ever two of them:
 // the inventory and the floor/open container
 //TODO: unused as of yet
-struct client_container
+struct client_container : vector< refitem, slice_allocator<refitem> >
 {
+  client *ns;
   enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
 
+  bool item_changed; // one of the items in here possibly changed
+
   // for mapspace and container
-  sint16 x, y;
+  int x, y;
   maptile *map;
 
   // for container
   object *env;
+
+  client_container (client *ns)
+  : ns (ns), type (CC_NONE) { }
+
+  tag_t tag () const;
+
+  inline iterator merge_item (iterator i, object *op);
+
+  void clear ();
+  void update ();
+
+  void set_mapspace (maptile *map, int x, int y);
+  void set_container (object *env);
 };
 
 /* 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_base
+struct client : zero_initialised, attachable<client>
 {
-  enum Sock_Status status;
   int ACC (RW, fd);
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
   uint8 *faces_sent;                      // This is a bitmap on sent face status
@@ -147,6 +165,7 @@
 
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
   uint8 ACC (RW, password_fails);         /* how many times the player has failed to give the right password */
+  bool destroyed;                         // set when this socket is to be destroyed
   Buffer outputbuffer;                    
 
   bool ACC (RW, facecache);               /* If true, client is caching images */
@@ -195,12 +214,19 @@
 
   std::deque< command, slice_allocator<command> > cmd_queue;
 
-  // resets movement state
+  // large structures at the end please
+  struct Map lastmap;
+  std::bitset<MAXANIMNUM> anims_sent;
+  // if we get an incomplete packet, this is used to hold the data.
+  // we add 2 byte for the header, one for the trailing 0 byte
+  uint8 inbuf[MAXSOCKBUF + 2 + 1];
+
   bool may_execute (const packet_type *pkt) const;
   void execute (const packet_type *pkt, char *data, int datalen);
 
   void queue_command (packet_type *handler, char *data, int datalen);
   bool handle_command ();
+  // resets movement state
   void reset_state ();
 
   bool handle_packet ();
@@ -221,12 +247,7 @@
   // called when the player has been moved
   void floorbox_reset  () { look_position = 0; floorbox_update (); }
 
-  // large structures at the end please
-  struct Map lastmap;
-  std::bitset<MAXANIMNUM> anims_sent;
-  // if we get an incomplete packet, this is used to hold the data.
-  // we add 2 byte for the header, one for the trailing 0 byte
-  uint8 inbuf[MAXSOCKBUF + 2 + 1];
+  static client *create (int fd, const char *peername);
 };
 
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\