--- deliantra/server/include/client.h	2007/01/06 14:42:30	1.23
+++ deliantra/server/include/client.h	2007/01/07 02:39:14	1.24
@@ -94,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,
 };
@@ -172,6 +171,7 @@
   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;                    
@@ -309,9 +309,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