--- deliantra/server/include/client.h	2007/01/08 18:18:35	1.25
+++ deliantra/server/include/client.h	2007/03/10 19:48:16	1.31
@@ -1,26 +1,26 @@
 /*
-    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
-
-    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.
-
-    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
-*/
+ * 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
+ * 
+ * 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.
+ * 
+ * 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
+ */
 
 #ifndef CLIENT_H
 #define CLIENT_H
@@ -100,8 +100,10 @@
 
 // a handler for a specific type of packet
 enum {
-  PF_PLAYER    = 0x01, // must have valid player / will by synchronised
-  PF_PLAYING   = 0x02, // must be in playing state
+  PF_PLAYER   = 0x01, // must have valid player / will by synchronised
+  PF_PLAYING  = 0x02, // must be in playing state
+  PF_COMMAND0 = 0x04, // command starts at offset 0
+  PF_COMMAND6 = 0x08, // command starts at offset 6
 };
 
 struct packet_type
@@ -173,7 +175,6 @@
   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) */
@@ -222,6 +223,7 @@
   uint8 ACC (RW, faceset);                /* Set the client is using, default 0 */
 
   maptile *ACC (RW, current_map);         // CF+ last/current player map
+  region *ACC (RW, current_region);       // CF+ last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, version)[64];             // CF+ client name/version
 
@@ -232,8 +234,9 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  iw  cmd_ev;    void cmd_cb (iw &w);
   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;
 
@@ -320,7 +323,8 @@
 #define PNG_FACE_INDEX	0
 
 #define VERSION_CS 1023        /* version >= 1023 understand setup cmd */
-#define VERSION_SC 1027
+#define VERSION_SC 1026
+//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
 #define VERSION_INFO "Crossfire+ Server"
 
 typedef object_vector<client, &client::active> sockvec;