--- deliantra/server/include/client.h	2010/04/06 21:11:48	1.94
+++ deliantra/server/include/client.h	2011/04/23 04:56:47	1.102
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -97,12 +97,6 @@
  * are using.
  */
 
-/* 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 { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
-
 // states the socket can be in
 enum {
  ST_DEAD,     // socket is dead
@@ -173,36 +167,34 @@
   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 */
+  sint64 ACC (RW, last_skill_exp[CS_NUM_SKILLS]);/* shadow register. if != exp. obj update client */
 
   bool ACC (RW, afk);                     /* player is afk */
   bool ACC (RW, sent_scroll);             
   bool ACC (RW, sound);                   /* does the client want sound */
-  bool ACC (RW, newmapcmd);               /* Send newmap command when entering new map SMACFIGGEN */
+  bool ACC (RW, bumpmsg);                 /* give message when bumping into walls */
+
   bool ACC (RW, plugincmd);               // extend the protocol through a plug-in */
   bool ACC (RW, mapinfocmd);              // return map info and send map change info
   uint8_t ACC (RW, extcmd);               // call into extensions/plugins
+  bool ACC (RW, need_delinv0);            /* If true, we need to delinv 0 before sending new floorbox */
+
   bool ACC (RW, update_look);             /* If true, we need to send the look window */
   bool ACC (RW, update_spells);           // If true, we need to esrv_update_spells
   bool ACC (RW, has_readable_type);       /* If true client accept additional text information */
-                                          /* used to arrange text in books, scrolls, or scripted dialogs */
   bool ACC (RW, monitor_spells);          /* Client wishes to be informed when their spell list changes */
-  bool ACC (RW, smoothing);               // deliantra-style smoothing
 
+  bool ACC (RW, smoothing);               // deliantra-style smoothing
   bool ACC (RW, force_newmap);            // force a newmap before next map update
-  uint32 ACC (RW, supported_readables);   /* each bit is a readable supported by client */
-  uint32 ACC (RW, cs_version), ACC (RW, sc_version);        /* versions of the client */
   uint16 ACC (RW, look_position);         /* start of drawing of look window */
   uint16 ACC (RW, mss);                   // likely tcp maximum segment size
-  uint8 ACC (RW, mapmode);                /* Type of map commands the client wants. */
-  uint8 ACC (RW, mapx), ACC (RW, mapy);             /* How large a map the client wants */
+  uint8 ACC (RW, mapx), ACC (RW, mapy);   /* How large a map the client wants */
   uint8 ACC (RW, itemcmd);                /* What version of the 'item' protocol command to use */
+  uint8 ACC (RW, faceset);                // CF+ selected faceset
 
   maptile_ptr ACC (RW, current_map);      // CF+ last/current player map
   region_ptr ACC (RW, current_region);    // CF+ last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
-  shstr ACC (RW, version);                // CF+ client name/version
-  uint8 ACC (RW, faceset);                // CF+ selected faceset
 
   tstamp ACC (RW, last_send);             // last data send on socket.
 
@@ -359,11 +351,6 @@
 #define FACE_TYPES  1
 #define PNG_FACE_INDEX	0
 
-#define VERSION_CS 1023        /* version >= 1023 understand setup cmd */
-#define VERSION_SC 1026
-//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
-#define VERSION_INFO "Deliantra Server"
-
 //-GPL
 
 typedef object_vector<client, &client::active> sockvec;