--- deliantra/server/include/client.h 2006/12/21 06:12:36 1.14 +++ deliantra/server/include/client.h 2007/01/08 18:18:35 1.25 @@ -1,6 +1,7 @@ /* 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 @@ -79,7 +80,6 @@ /* 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]; @@ -87,6 +87,17 @@ 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_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 @@ -153,25 +164,38 @@ /* 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 +INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player +struct client : zero_initialised, attachable { 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; + 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) */ - uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ - bool destroyed; // set when this socket is to be destroyed - Buffer outputbuffer; + uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ + + sint8 ACC (RW, last_level); /* Last level we sent to client */ + uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */ + float ACC (RW, last_weapon_sp); /* if diff than weapon_sp, update client */ + sint32 ACC (RW, last_weight); /* Last weight as sent to client; -1 means do not send weight */ + sint32 ACC (RW, last_weight_limit); /* Last weight limit transmitted to client */ + uint32 ACC (RW, last_path_attuned); /* Last spell attunment sent to client */ + uint32 ACC (RW, last_path_repelled); /* Last spell repelled sent to client */ + uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */ + 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 */ + bool ACC (RW, afk); /* player is afk */ 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 */ @@ -201,13 +225,12 @@ 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 (); + 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); @@ -225,16 +248,18 @@ void execute (const packet_type *pkt, char *data, int datalen); void queue_command (packet_type *handler, char *data, int datalen); - bool handle_command (); + MTH bool handle_command (); // resets movement state - void reset_state (); + MTH void reset_state (); + // resets variable data used to send stat diffs + MTH void reset_stats (); - bool handle_packet (); + MTH 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 (); + MTH void flush (); + MTH void write_outputbuffer (); void send (void *buf_, int len); void send_packet (const char *buf); @@ -243,11 +268,15 @@ void send_packet (packet &sl); // called when something under the player changes - void floorbox_update () { update_look = 1; } + MTH void floorbox_update () { update_look = 1; } // called when the player has been moved - void floorbox_reset () { look_position = 0; floorbox_update (); } + MTH void floorbox_reset () { look_position = 0; floorbox_update (); } - static client *create (int fd, const char *peername); + MTH static client *create (int fd, const char *peername); + +protected: + client (int fd, const char *from_ip); + ~client (); }; #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ @@ -294,9 +323,14 @@ #define VERSION_SC 1027 #define VERSION_INFO "Crossfire+ Server" -typedef unordered_vector sockvec; +typedef object_vector sockvec; extern sockvec clients; + +#define for_all_clients(var) \ + for (int _i = 0; _i < clients.size (); ++_i) \ + declvar (client *, var, clients [_i]) + extern int nrofpixmaps; //TODO: hrmpf, should go #endif