[ViewVC] Diff of: cvs/deliantra/server/include/client.h

Comparing deliantra/server/include/client.h (file contents):
Revision 1.12 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.18 by root, Sat Dec 23 06:21:02 2006 UTC

 #ifndef CLIENT_H
 #define CLIENT_H
 #include <deque>
 #include <bitset>
-#include <list>
+#include <tr1/unordered_set>
 // (possibly) max. number of objects "per page" in the ground container
 #define FLOORBOX_PAGESIZE 50
 struct MapCell
  * current state.  we set up our on buffers for sending/receiving, so we can
  * handle some higher level functions.  fd is the actual file descriptor we
  * are using.
  */
-enum Sock_Status { Ns_Add, Ns_Dead };
 /* 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 MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
-/* The following is the setup for a ring buffer for storing outbut
+/* The following is the setup for a ring buffer for storing output
  * data that the OS can't handle right away.
  */
 struct Buffer
 {
   char data[SOCKETBUFSIZE];
   int start;
   int len;
+};
+// states the socket can be in
+enum {
+ ST_DEAD,     // socket is dead
+ ST_SETUP,    // initial handshake / setup / login
+ ST_PLAYING,  // logged in an playing
+ ST_CUSTOM,   // waiting for custom reply
+ ST_CONFIRM_QUIT,
+ ST_CHANGE_CLASS,
+ ST_GET_PARTY_PASSWORD,
 };
 // a handler for a specific type of packet
 enum {
   PF_PLAYER    = 0x01, // must have valid player / will by synchronised
   {
     sfree<char> (data, datalen + 1);
   }
 };
+struct refitem
+{
+  object_ptr op;
+};
 // this represents a container on the client side.
 // right now, there are only ever two of them:
 // the inventory and the floor/open container
 //TODO: unused as of yet
-struct client_container
+struct client_container : vector< refitem, slice_allocator<refitem> >
 {
+  client *ns;
   enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
+  bool item_changed; // one of the items in here possibly changed
   // for mapspace and container
-  sint16 x, y;
+  int x, y;
   maptile *map;
   // for container
   object *env;
+  client_container (client *ns)
+  : ns (ns), type (CC_NONE) { }
+  tag_t tag () const;
+  inline iterator merge_item (iterator i, object *op);
+  void clear ();
+  void update ();
+  void set_mapspace (maptile *map, int x, int y);
+  void set_container (object *env);
 };
 /* how many times we are allowed to give the wrong password before being kicked. */
 #define MAX_PASSWORD_FAILURES 5
 ACC_CLASS (client) // should become player when newsocket is a baseclass of player
-struct client : zero_initialised, attachable_base
+struct client : zero_initialised, attachable<client>
 {
-  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
   statsinfo stats;
   client_container cc_inv, cc_other;
+  Buffer outputbuffer;
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
+  uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
   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 */
   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
-  player *ACC (RO, pl);//TODO should not be here, preferably
+  player_ptr ACC (RO, pl);
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
   client (int fd, const char *from_ip);
   ~client ();
   void destroy ();
+  bool destroyed () const { return state == ST_DEAD; }
   iw  cmd_ev;    void cmd_cb (iw &w);
   iow socket_ev; void socket_cb (iow &w, int got);
   std::deque< command, slice_allocator<command> > cmd_queue;
-  // resets movement state
-  bool may_execute (const packet_type *pkt) const;
-  void execute (const packet_type *pkt, char *data, int datalen);
-  void queue_command (packet_type *handler, char *data, int datalen);
-  bool handle_command ();
-  void reset_state ();
-  bool handle_packet ();
-  int next_packet ();                     // returns length of packet or 0
-  void skip_packet (int len);             // we have processed the packet, skip it
-  void flush ();
-  void write_outputbuffer ();
-  void send (void *buf_, int len);
-  void send_packet (const char *buf);
-  void send_packet (const char *buf, int len);
-  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];
+  bool may_execute (const packet_type *pkt) const;
+  void execute (const packet_type *pkt, char *data, int datalen);
+  void queue_command (packet_type *handler, char *data, int datalen);
+  bool handle_command ();
+  // resets movement state
+  void reset_state ();
+  bool handle_packet ();
+  int next_packet ();                     // returns length of packet or 0
+  void skip_packet (int len);             // we have processed the packet, skip it
+  void flush ();
+  void write_outputbuffer ();
+  void send (void *buf_, int len);
+  void send_packet (const char *buf);
+  void send_packet (const char *buf, int len);
+  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 (); }
+  static client *create (int fd, const char *peername);
 };
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
         ( ((__type)>0) &&\
           ((__sockPtr)->has_readable_type) && \

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/client.h (file contents): Revision 1.12 by root, Wed Dec 20 01:19:11 2006 UTC vs. Revision 1.18 by root, Sat Dec 23 06:21:02 2006 UTC

Diff Legend

Comparing deliantra/server/include/client.h (file contents):
Revision 1.12 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.18 by root, Sat Dec 23 06:21:02 2006 UTC