--- deliantra/server/include/client.h 2006/12/15 20:08:45 1.3 +++ deliantra/server/include/client.h 2006/12/19 05:41:21 1.11 @@ -1,4 +1,3 @@ - /* CrossFire, A Multiplayer game for the X Window System @@ -22,21 +21,14 @@ The author can be reached via e-mail to crossfire@schmorp.de */ -/* - newserver.h defines various structures and values that are use for the - new client server communication method. Values defined here are only - used on the server side code. For shared client/server values, see - newclient.h -*/ - #ifndef CLIENT_H #define CLIENT_H -/* Reduce this from 50 to 5 - as it is now, there will never be more - * than 3 anyways. - */ +#include +#include -#define NUM_LOOK_OBJECTS 50 +// (possibly) max. number of objects "per page" in the ground container +#define FLOORBOX_PAGESIZE 50 struct MapCell { @@ -96,6 +88,32 @@ int len; }; +// 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 +}; + +struct packet_type +{ + const char *name; + void *cb; + int flags; +}; + +struct command +{ + tstamp stamp; + const packet_type *handler; + char *data; + int datalen; + + ~command () + { + sfree (data, datalen + 1); + } +}; + /* how many times we are allowed to give the wrong password before being kicked. */ #define MAX_PASSWORD_FAILURES 5 @@ -105,36 +123,33 @@ enum Sock_Status status; int ACC (RW, fd); unsigned int inbuf_len; // number of bytes valid in inbuf - struct Map lastmap; - size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */ - uint8 *faces_sent; /* This is a bitmap on sent face status */ - uint8 anims_sent[MAXANIMNUM]; - struct statsinfo stats; + 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; /* For undeliverable data */ + 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 */ + 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 */ @@ -146,20 +161,31 @@ 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 - /* If we get an incomplete packet, this is used to hold the data. */ - uint8 inbuf[MAXSOCKBUF]; player *ACC (RO, pl);//TODO should not be here, preferably int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ - iow socket_ev; void socket_cb (iow &w, int got); - client (int fd, const char *from_ip); ~client (); + void destroy (); + + iw cmd_ev; void cmd_cb (iw &w); + iow socket_ev; void socket_cb (iow &w, int got); - int read_packet (); // returns length of packet or 0 + std::deque< command, slice_allocator > 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 (); @@ -168,7 +194,20 @@ 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 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)\