--- deliantra/server/include/client.h	2006/12/17 23:10:35	1.8
+++ deliantra/server/include/client.h	2006/12/19 05:12:52	1.10
@@ -90,9 +90,8 @@
 
 // a handler for a specific type of packet
 enum {
-  PF_PLAYER    = 0x01, // must have valid player
-  PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
-  PF_PLAYING   = 0x04, // must be in playing state
+  PF_PLAYER    = 0x01, // must have valid player / will by synchronised
+  PF_PLAYING   = 0x02, // must be in playing state
 };
 
 struct packet_type
@@ -123,34 +122,34 @@
 {
   enum Sock_Status status;
   int ACC (RW, fd);
-  unsigned int inbuf_len;                // number of bytes valid in inbuf
-  uint8 *faces_sent;                     // This is a bitmap on sent face status
-  struct statsinfo stats;
-
-  char *ACC (RW, host);                  /* Which host it is connected from (ip address) */
-  uint8 ACC (RW, password_fails);        /* how many times the player has failed to give the right password */
-  Buffer outputbuffer;
-
-  bool ACC (RW, facecache);              /* If true, client is caching images */
-  bool ACC (RW, sent_scroll);
-  bool ACC (RW, sound);                  /* does the client want sound */
-  bool ACC (RW, exp64);                  /* Client wants 64 bit exp data, as well as skill data */
-  bool ACC (RW, newmapcmd);              /* Send newmap command when entering new map SMACFIGGEN */
-  bool ACC (RW, plugincmd);              /* CF+ extend the protocol through a plug-in */
-  bool ACC (RW, mapinfocmd);             /* CF+ return map info and send map change info */
-  bool ACC (RW, extcmd);                 /* CF+ call into extensions/plugins */
-  bool ACC (RW, extmap);                 /* CF+ extend map comamnd with extra data */
-  bool ACC (RW, buggy_mapscroll);        /* CF+ client crashes on large mapscrolls */
-  bool ACC (RW, darkness);               /* True if client wants darkness information */
-  bool ACC (RW, image2);                 /* Client wants image2/face2 commands */
-  bool ACC (RW, update_look);            /* If true, we need to send the look window */
-  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, ext_mapinfos);           /* If true client accept additionnal info on maps */
-                                         /* Below are flags for extedend infos to pass to client 
-                                         * with S->C mapextended command */
-  bool ACC (RW, EMI_smooth);             /* Send smooth in extendmapinfos */
+  unsigned int inbuf_len;                 // number of bytes valid in inbuf
+  uint8 *faces_sent;                      // This is a bitmap on sent face status
+  struct statsinfo stats;                 
+
+  char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
+  uint8 ACC (RW, password_fails);         /* how many times the player has failed to give the right password */
+  Buffer outputbuffer;                    
+
+  bool ACC (RW, facecache);               /* If true, client is caching images */
+  bool ACC (RW, sent_scroll);             
+  bool ACC (RW, sound);                   /* does the client want sound */
+  bool ACC (RW, exp64);                   /* Client wants 64 bit exp data, as well as skill data */
+  bool ACC (RW, newmapcmd);               /* Send newmap command when entering new map SMACFIGGEN */
+  bool ACC (RW, plugincmd);               /* CF+ extend the protocol through a plug-in */
+  bool ACC (RW, mapinfocmd);              /* CF+ return map info and send map change info */
+  bool ACC (RW, extcmd);                  /* CF+ call into extensions/plugins */
+  bool ACC (RW, extmap);                  /* CF+ extend map comamnd with extra data */
+  bool ACC (RW, buggy_mapscroll);         /* CF+ client crashes on large mapscrolls */
+  bool ACC (RW, darkness);                /* True if client wants darkness information */
+  bool ACC (RW, image2);                  /* Client wants image2/face2 commands */
+  bool ACC (RW, update_look);             /* If true, we need to send the look window */
+  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, ext_mapinfos);            /* If true client accepts additional info on maps */
+                                          /* Below are flags for extedend infos to pass to client 
+                                           * with S->C mapextended command */
+  bool ACC (RW, EMI_smooth);              /* Send smooth in extendmapinfos */
 
   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 */
@@ -162,7 +161,7 @@
 
   maptile *ACC (RW, current_map);         // CF+ last/current player map
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
-  char ACC (RW, version)[64];              // CF+ client name/version
+  char ACC (RW, version)[64];             // CF+ client name/version
 
   player *ACC (RO, pl);//TODO should not be here, preferably
 
@@ -198,13 +197,17 @@
   void send_packet_printf (const char *format, ...);
   void send_packet (packet &sl);
 
+  // called when something under the player changes
+  void floorbox_update () { update_look = 1; }
+  // called when the player has been moved
+  void floorbox_reset  () { look_position = 0; floorbox_update (); }
+
   // large structures at the end please
   struct Map lastmap;
   std::bitset<MAXANIMNUM> anims_sent;
   // if we get an incomplete packet, this is used to hold the data.
   // we add 2 byte for the header, one for the trailing 0 byte
   uint8 inbuf[MAXSOCKBUF + 2 + 1];
-
 };
 
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\