--- deliantra/server/include/client.h 2007/03/11 02:12:44 1.32 +++ deliantra/server/include/client.h 2007/03/16 02:37:54 1.41 @@ -35,22 +35,15 @@ struct MapCell { UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient - int count; /* This is really darkness in the map1 command */ + int count; /* This is really darkness in the map1 command */ faceidx faces[MAP_LAYERS]; - uint16 smooth[MAP_LAYERS]; - unsigned char stat_hp; // health of something in this space, or 0 + unsigned char stat_hp; // health of something in this space, or 0 unsigned char flags; + uint8_t smooth[MAP_LAYERS]; }; -/* This basically defines the largest size an - * archetype may be - it is used for allocation of - * some structures, as well as determining how far - * we should look for the heads of big images. - */ -#define MAX_HEAD_OFFSET 8 - -#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) -#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) +#define MAX_CLIENT_X MAP_CLIENT_X +#define MAX_CLIENT_Y MAP_CLIENT_Y struct Map { @@ -58,7 +51,7 @@ }; /* True max is 16383 given current map compaction method */ -# define MAXANIMNUM 2000 +#define MAXANIMNUM 10000 struct statsinfo { @@ -197,11 +190,15 @@ bool ACC (RW, sent_scroll); bool ACC (RW, sound); /* does the client want sound */ 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, plugincmd); // extend the protocol through a plug-in */ + bool ACC (RW, mapinfocmd); // return map info and send map change info + bool ACC (RW, extcmd); // call into extensions/plugins + bool ACC (RW, extmap); // extend map comamnd with extra data + bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls + bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient + bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient + bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload + bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images 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 */ @@ -213,6 +210,7 @@ * with S->C mapextended command */ bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ + bool ACC (RW, force_newmap); // force a newmap before next map update 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 */ enum MapMode mapmode; /* Type of map commands the client wants. */ @@ -228,7 +226,12 @@ player_ptr ACC (RO, pl); - int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ + int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ + + int ACC (RW, max_rate); // max. # of bytes to send per tick + faceidx ACC (RW, scrub_idx); // which face to send next + int ACC (RW, bg_scrub); // how many ticks till the next background face send + std::vector askface; // which faces have been requested by the client void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; @@ -242,7 +245,8 @@ // large structures at the end please struct Map lastmap; std::bitset anims_sent; - uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status + std::bitset faces_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]; @@ -263,6 +267,7 @@ MTH void flush (); MTH void write_outputbuffer (); + MTH int outputbuffer_len () const { return outputbuffer.len; } void send (void *buf_, int len); void send_packet (const char *buf); @@ -270,11 +275,19 @@ void send_packet_printf (const char *format, ...); void send_packet (packet &sl); + void send_drawinfo (const char *msg, int flags = NDI_BLACK); + MTH void send_face (faceidx facenum); + MTH void send_image (faceidx facenum); + MTH void send_faces (object *ob); + MTH void send_animation (short anim_num); + // called when something under the player changes MTH void floorbox_update () { update_look = 1; } // called when the player has been moved MTH void floorbox_reset () { look_position = 0; floorbox_update (); } + MTH void tick (); // called every server tick to do housekeeping etc. + MTH static client *create (int fd, const char *peername); protected: @@ -287,12 +300,6 @@ ((__sockPtr)->has_readable_type) && \ ((__sockPtr)->supported_readables & (1<<(__type))) ) -/* Bitmask for the faces_sent[] array - what - * portion of the face have we sent? - */ -#define NS_FACESENT_FACE 0x1 -#define NS_FACESENT_SMOOTH 0x2 - /* Constants in the form EMI_ is for extended map infos. * Even if the client select the additionnal infos it wants * on the map, there may exist cases where this whole info