--- deliantra/server/include/client.h 2007/02/15 04:04:22 1.29 +++ deliantra/server/include/client.h 2007/03/15 03:30:37 1.39 @@ -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 */ - uint16 faces[MAP_LAYERS]; - uint16 smooth[MAP_LAYERS]; - unsigned char stat_hp; // health of something in this space, or 0 + int count; /* This is really darkness in the map1 command */ + faceidx faces[MAP_LAYERS]; + 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 { @@ -171,11 +164,9 @@ { 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; int ACC (RO, active); - client_container cc_inv, cc_other; Buffer outputbuffer; char *ACC (RW, host); /* Which host it is connected from (ip address) */ @@ -204,6 +195,8 @@ 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, force_face0); /* CF+ client workaround for buggy checksum calculation in gcfclient */ + bool ACC (RW, force_bad_checksum); /* CF+ client workaround for buggy checksum calculation in gcfclient */ 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 */ @@ -221,28 +214,36 @@ uint16 ACC (RW, look_position); /* start of drawing of look window */ uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ - uint8 ACC (RW, faceset); /* Set the client is using, default 0 */ maptile *ACC (RW, current_map); // CF+ last/current player map region *ACC (RW, current_region); // CF+ last/current player region int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position char ACC (RW, version)[64]; // CF+ client name/version + uint8 ACC (RW, faceset); // CF+ selected faceset 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; - iw cmd_ev; void cmd_cb (iw &w); iow socket_ev; void socket_cb (iow &w, int got); + iw cmd_ev; void cmd_cb (iw &w); + client_container cc_inv, cc_other; std::deque< command, slice_allocator > cmd_queue; // large structures at the end please struct Map lastmap; std::bitset anims_sent; + 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 +264,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 +272,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 +297,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 @@ -323,7 +327,8 @@ #define PNG_FACE_INDEX 0 #define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ -#define VERSION_SC 1027 +#define VERSION_SC 1026 +//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible #define VERSION_INFO "Crossfire+ Server" typedef object_vector sockvec; @@ -334,7 +339,5 @@ for (int _i = 0; _i < clients.size (); ++_i) \ declvar (client *, var, clients [_i]) -extern int nrofpixmaps; //TODO: hrmpf, should go - #endif