ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/client.h
(Generate patch)

Comparing deliantra/server/include/client.h (file contents):
Revision 1.35 by root, Wed Mar 14 00:04:58 2007 UTC vs.
Revision 1.38 by root, Wed Mar 14 15:44:47 2007 UTC

… …
33#define FLOORBOX_PAGESIZE 50 33#define FLOORBOX_PAGESIZE 50
34 34
35struct MapCell 35struct MapCell
36{ 36{
37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
38 int count; /* This is really darkness in the map1 command */ 38 int count; /* This is really darkness in the map1 command */
39 faceidx faces[MAP_LAYERS]; 39 faceidx faces[MAP_LAYERS];
40 uint16 smooth[MAP_LAYERS];
41 unsigned char stat_hp; // health of something in this space, or 0 40 unsigned char stat_hp; // health of something in this space, or 0
42 unsigned char flags; 41 unsigned char flags;
42 uint8_t smooth[MAP_LAYERS];
43}; 43};
44 44
45#define MAX_CLIENT_X MAP_CLIENT_X 45#define MAX_CLIENT_X MAP_CLIENT_X
46#define MAX_CLIENT_Y MAP_CLIENT_Y 46#define MAX_CLIENT_Y MAP_CLIENT_Y
47 47
… …
221 char ACC (RW, version)[64]; // CF+ client name/version 221 char ACC (RW, version)[64]; // CF+ client name/version
222 uint8 ACC (RW, faceset); // CF+ selected faceset 222 uint8 ACC (RW, faceset); // CF+ selected faceset
223 223
224 player_ptr ACC (RO, pl); 224 player_ptr ACC (RO, pl);
225 225
226 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 226 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
227
228 int ACC (RW, max_rate); // max. # of bytes to send per tick
229 std::vector<faceidx> askface; // which faces have been requested by the client
227 230
228 void do_destroy (); 231 void do_destroy ();
229 void gather_callbacks (AV *&callbacks, event_type event) const; 232 void gather_callbacks (AV *&callbacks, event_type event) const;
230 233
231 iow socket_ev; void socket_cb (iow &w, int got); 234 iow socket_ev; void socket_cb (iow &w, int got);
… …
235 std::deque< command, slice_allocator<command> > cmd_queue; 238 std::deque< command, slice_allocator<command> > cmd_queue;
236 239
237 // large structures at the end please 240 // large structures at the end please
238 struct Map lastmap; 241 struct Map lastmap;
239 std::bitset<MAXANIMNUM> anims_sent; 242 std::bitset<MAXANIMNUM> anims_sent;
240 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status 243 std::bitset<MAX_FACES> faces_sent;
244
241 // if we get an incomplete packet, this is used to hold the data. 245 // if we get an incomplete packet, this is used to hold the data.
242 // we add 2 byte for the header, one for the trailing 0 byte 246 // we add 2 byte for the header, one for the trailing 0 byte
243 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 247 uint8 inbuf[MAXSOCKBUF + 2 + 1];
244 248
245 bool may_execute (const packet_type *pkt) const; 249 bool may_execute (const packet_type *pkt) const;
… …
256 int next_packet (); // returns length of packet or 0 260 int next_packet (); // returns length of packet or 0
257 void skip_packet (int len); // we have processed the packet, skip it 261 void skip_packet (int len); // we have processed the packet, skip it
258 262
259 MTH void flush (); 263 MTH void flush ();
260 MTH void write_outputbuffer (); 264 MTH void write_outputbuffer ();
265 MTH int outputbuffer_len () const { return outputbuffer.len; }
261 void send (void *buf_, int len); 266 void send (void *buf_, int len);
262 267
263 void send_packet (const char *buf); 268 void send_packet (const char *buf);
264 void send_packet (const char *buf, int len); 269 void send_packet (const char *buf, int len);
265 void send_packet_printf (const char *format, ...); 270 void send_packet_printf (const char *format, ...);
266 void send_packet (packet &sl); 271 void send_packet (packet &sl);
267 272
268 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 273 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
269 MTH void send_face (faceidx facenum, bool nocache = false); 274 MTH void send_face (faceidx facenum);
275 MTH void send_image (faceidx facenum);
270 MTH void send_faces (object *ob); 276 MTH void send_faces (object *ob);
271 MTH void send_smooth (faceidx facenum);
272 MTH void send_animation (short anim_num); 277 MTH void send_animation (short anim_num);
273 278
274 // called when something under the player changes 279 // called when something under the player changes
275 MTH void floorbox_update () { update_look = 1; } 280 MTH void floorbox_update () { update_look = 1; }
276 // called when the player has been moved 281 // called when the player has been moved
… …
285 290
286#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 291#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
287 ( ((__type)>0) &&\ 292 ( ((__type)>0) &&\
288 ((__sockPtr)->has_readable_type) && \ 293 ((__sockPtr)->has_readable_type) && \
289 ((__sockPtr)->supported_readables & (1<<(__type))) ) 294 ((__sockPtr)->supported_readables & (1<<(__type))) )
290
291/* Bitmask for the faces_sent[] array - what
292 * portion of the face have we sent?
293 */
294#define NS_FACESENT_FACE 0x1
295#define NS_FACESENT_SMOOTH 0x2
296 295
297/* Constants in the form EMI_ is for extended map infos. 296/* Constants in the form EMI_ is for extended map infos.
298 * Even if the client select the additionnal infos it wants 297 * Even if the client select the additionnal infos it wants
299 * on the map, there may exist cases where this whole info 298 * on the map, there may exist cases where this whole info
300 * is not given in one buch but in separate bunches. This 299 * is not given in one buch but in separate bunches. This

Diff Legend

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