--- deliantra/server/include/client.h	2012/11/11 04:29:11	1.111
+++ deliantra/server/include/client.h	2012/11/15 04:50:50	1.113
@@ -103,15 +103,14 @@
 
 // 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_COMMAND0 = 0x04, // command starts at offset 0
-  PF_COMMAND6 = 0x08, // command starts at offset 6
+  PF_PLAYER  = 0x01, // must have valid player / will by synchronised
+  PF_PLAYING = 0x02, // must be in playing state
+  PF_COMMAND = 0x04, // is a suer command
 };
 
 // face types. bit 0 means "has meta info prepended"
 enum {
-  FT_FACE  = 0 * 2 + 0, // faces (images)
+  FT_IMAGE = 0 * 2 + 0, // images
   FT_MUSIC = 1 * 2 + 1, // background music
   FT_SOUND = 2 * 2 + 1, // effects
   FT_RSRC  = 3 * 2 + 0, // generic data files
@@ -189,11 +188,11 @@
   uint16 ACC (RW, mss);                   // likely tcp maximum segment size
   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
+  uint8 ACC (RW, tileset);                // selected tileset
   uint8 ACC (RW, ws_version);             // websocket protocol versio for framing
 
-  maptile_ptr ACC (RW, current_map);      // CF+ last/current player map
-  region_ptr ACC (RW, current_region);    // CF+ last/current player region
+  maptile_ptr ACC (RW, current_map);      // last/current player map
+  region_ptr ACC (RW, current_region);    // last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
 
   tstamp ACC (RW, last_send);             // last data send on socket.