--- deliantra/server/include/client.h	2007/04/25 18:47:50	1.49
+++ deliantra/server/include/client.h	2007/06/09 22:54:03	1.53
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for the X Window System
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 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.
+ * 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 GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to crossfire@schmorp.de
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 #ifndef CLIENT_H
@@ -108,43 +108,6 @@
   }
 };
 
-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 : 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
-  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
 
@@ -155,6 +118,7 @@
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
   statsinfo stats;
   int ACC (RO, active);
+  player_ptr ACC (RO, pl);
 
   /* The following is the setup for a ring buffer for storing output
    * data that the OS can't handle right away.
@@ -226,7 +190,7 @@
   shstr ACC (RW, version);                // CF+ client name/version
   uint8 ACC (RW, faceset);                // CF+ selected faceset
 
-  player_ptr ACC (RO, pl);
+  tstamp ACC (RW, last_send);             // last data send on socket.
 
   int ACC (RW, rtt), ACC (RW, rttvar);    /* round-trip time and -variance, if known */
 
@@ -247,7 +211,6 @@
 
   iow socket_ev; void socket_cb (iow &w, int got);
   iw  cmd_ev;    void cmd_cb (iw &w);
-  client_container cc_inv, cc_other;
 
   std::deque< command, slice_allocator<command> > cmd_queue;
 
@@ -361,7 +324,7 @@
 
 #define for_all_clients(var)                    \
   for (int _i = 0; _i < clients.size (); ++_i)  \
-    declvar (client *, var, clients [_i])
+    statementvar (client *, var, clients [_i])
 
 #endif