--- deliantra/server/include/client.h	2006/12/26 05:44:14	1.22
+++ deliantra/server/include/client.h	2007/01/08 18:18:35	1.25
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for the X Window System
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -93,7 +94,6 @@
  ST_PLAYING,  // logged in an playing
  ST_CUSTOM,   // waiting for custom reply
 
- ST_CONFIRM_QUIT,
  ST_CHANGE_CLASS,
  ST_GET_PARTY_PASSWORD,
 };
@@ -171,13 +171,26 @@
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
   uint8 *faces_sent;                      // This is a bitmap on sent face status
   statsinfo stats;
+  int ACC (RO, active);
 
   client_container cc_inv, cc_other;
   Buffer outputbuffer;                    
 
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
   uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
-  uint8 ACC (RW, password_fails);         /* how many times the player has failed to give the right password */
+
+  sint8 ACC (RW, last_level);             /* Last level we sent to client */
+  uint16 ACC (RW, last_flags);            /* fire/run on flags for last tick */
+  float ACC (RW, last_weapon_sp);         /* if diff than weapon_sp, update client */
+  sint32 ACC (RW, last_weight);           /* Last weight as sent to client; -1 means do not send weight */
+  sint32 ACC (RW, last_weight_limit);     /* Last weight limit transmitted to client */
+  uint32 ACC (RW, last_path_attuned);     /* Last spell attunment sent to client */
+  uint32 ACC (RW, last_path_repelled);    /* Last spell repelled sent to client */
+  uint32 ACC (RW, last_path_denied);      /* Last spell denied sent to client */
+  living ACC (RO, last_stats);            /* Last stats as sent to client */
+  float ACC (RW, last_speed);             /* Last speed as sent to client */
+  sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
+  sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
 
   bool ACC (RW, afk);                     /* player is afk */
   bool ACC (RW, facecache);               /* If true, client is caching images */
@@ -238,6 +251,8 @@
   MTH bool handle_command ();
   // resets movement state
   MTH void reset_state ();
+  // resets variable data used to send stat diffs
+  MTH void reset_stats ();
 
   MTH bool handle_packet ();
   int next_packet ();                     // returns length of packet or 0
@@ -308,9 +323,14 @@
 #define VERSION_SC 1027
 #define VERSION_INFO "Crossfire+ Server"
 
-typedef unordered_vector<client *> sockvec;
+typedef object_vector<client, &client::active> sockvec;
 
 extern sockvec clients;
+
+#define for_all_clients(var)                    \
+  for (int _i = 0; _i < clients.size (); ++_i)  \
+    declvar (client *, var, clients [_i])
+
 extern int nrofpixmaps; //TODO: hrmpf, should go
 
 #endif