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.33 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.43 by root, Mon Apr 2 18:54:00 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
… …
66 66
67/* Only one map mode can actually be used, so lets make it a switch 67/* Only one map mode can actually be used, so lets make it a switch
68 * instead of having a bunch of different fields that needed to 68 * instead of having a bunch of different fields that needed to
69 * get toggled. 69 * get toggled.
70 */ 70 */
71enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
72 72
73/* The following is the setup for a ring buffer for storing output 73/* The following is the setup for a ring buffer for storing output
74 * data that the OS can't handle right away. 74 * data that the OS can't handle right away.
75 */ 75 */
76struct Buffer 76struct Buffer
… …
183 living ACC (RO, last_stats); /* Last stats as sent to client */ 183 living ACC (RO, last_stats); /* Last stats as sent to client */
184 float ACC (RW, last_speed); /* Last speed as sent to client */ 184 float ACC (RW, last_speed); /* Last speed as sent to client */
185 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */ 185 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
186 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */ 186 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
187 187
188 bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient
189 bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient
190 bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload
191 bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images
192
188 bool ACC (RW, afk); /* player is afk */ 193 bool ACC (RW, afk); /* player is afk */
189 bool ACC (RW, facecache); /* If true, client is caching images */ 194 bool ACC (RW, facecache); /* If true, client is caching images */
190 bool ACC (RW, sent_scroll); 195 bool ACC (RW, sent_scroll);
191 bool ACC (RW, sound); /* does the client want sound */ 196 bool ACC (RW, sound); /* does the client want sound */
192 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 197 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
193 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 198 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
194 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 199 bool ACC (RW, mapinfocmd); // return map info and send map change info
195 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 200 bool ACC (RW, extcmd); // call into extensions/plugins
196 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 201 bool ACC (RW, extmap); // extend map comamnd with extra data
197 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 202 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
198 bool ACC (RW, darkness); /* True if client wants darkness information */ 203 bool ACC (RW, darkness); /* True if client wants darkness information */
199 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 204 bool ACC (RW, image2); /* Client wants image2/face2 commands */
200 bool ACC (RW, update_look); /* If true, we need to send the look window */ 205 bool ACC (RW, update_look); /* If true, we need to send the look window */
201 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 206 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
202 /* used to arrange text in books, scrolls, or scripted dialogs */ 207 /* used to arrange text in books, scrolls, or scripted dialogs */
… …
204 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */ 209 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
205 /* Below are flags for extedend infos to pass to client 210 /* Below are flags for extedend infos to pass to client
206 * with S->C mapextended command */ 211 * with S->C mapextended command */
207 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 212 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
208 213
214 bool ACC (RW, force_newmap); // force a newmap before next map update
209 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 215 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
210 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 216 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
211 enum MapMode mapmode; /* Type of map commands the client wants. */
212 uint16 ACC (RW, look_position); /* start of drawing of look window */ 217 uint16 ACC (RW, look_position); /* start of drawing of look window */
218 uint16 ACC (RW, mss); // likely tcp maximum segment size
219 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
213 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 220 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
214 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 221 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
215 222
216 maptile *ACC (RW, current_map); // CF+ last/current player map 223 maptile *ACC (RW, current_map); // CF+ last/current player map
217 region *ACC (RW, current_region); // CF+ last/current player region 224 region *ACC (RW, current_region); // CF+ last/current player region
… …
219 char ACC (RW, version)[64]; // CF+ client name/version 226 char ACC (RW, version)[64]; // CF+ client name/version
220 uint8 ACC (RW, faceset); // CF+ selected faceset 227 uint8 ACC (RW, faceset); // CF+ selected faceset
221 228
222 player_ptr ACC (RO, pl); 229 player_ptr ACC (RO, pl);
223 230
224 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 231 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
232
233 int ACC (RW, max_rate); // max. # of bytes to send per tick
234 faceidx ACC (RW, scrub_idx); // which face to send next
235 int ACC (RW, bg_scrub); // how many ticks till the next background face send
236 std::vector<faceidx> askface; // which faces have been requested by the client
225 237
226 void do_destroy (); 238 void do_destroy ();
227 void gather_callbacks (AV *&callbacks, event_type event) const; 239 void gather_callbacks (AV *&callbacks, event_type event) const;
228 240
229 iow socket_ev; void socket_cb (iow &w, int got); 241 iow socket_ev; void socket_cb (iow &w, int got);
… …
233 std::deque< command, slice_allocator<command> > cmd_queue; 245 std::deque< command, slice_allocator<command> > cmd_queue;
234 246
235 // large structures at the end please 247 // large structures at the end please
236 struct Map lastmap; 248 struct Map lastmap;
237 std::bitset<MAXANIMNUM> anims_sent; 249 std::bitset<MAXANIMNUM> anims_sent;
238 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status 250 std::bitset<MAX_FACES> faces_sent;
251
239 // if we get an incomplete packet, this is used to hold the data. 252 // if we get an incomplete packet, this is used to hold the data.
240 // we add 2 byte for the header, one for the trailing 0 byte 253 // we add 2 byte for the header, one for the trailing 0 byte
241 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 254 uint8 inbuf[MAXSOCKBUF + 2 + 1];
242 255
243 bool may_execute (const packet_type *pkt) const; 256 bool may_execute (const packet_type *pkt) const;
… …
254 int next_packet (); // returns length of packet or 0 267 int next_packet (); // returns length of packet or 0
255 void skip_packet (int len); // we have processed the packet, skip it 268 void skip_packet (int len); // we have processed the packet, skip it
256 269
257 MTH void flush (); 270 MTH void flush ();
258 MTH void write_outputbuffer (); 271 MTH void write_outputbuffer ();
272 MTH int outputbuffer_len () const { return outputbuffer.len; }
259 void send (void *buf_, int len); 273 void send (void *buf_, int len);
260 274
261 void send_packet (const char *buf); 275 void send_packet (const char *buf);
262 void send_packet (const char *buf, int len); 276 void send_packet (const char *buf, int len);
263 void send_packet_printf (const char *format, ...); 277 void send_packet_printf (const char *format, ...);
264 void send_packet (packet &sl); 278 void send_packet (packet &sl);
265 279
280 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
281 MTH void send_face (faceidx facenum);
282 MTH void send_image (faceidx facenum);
283 MTH void send_faces (object *ob);
284 MTH void send_animation (short anim_num);
285
266 // called when something under the player changes 286 // called when something under the player changes
267 MTH void floorbox_update () { update_look = 1; } 287 MTH void floorbox_update () { update_look = 1; }
268 // called when the player has been moved 288 // called when the player has been moved
269 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 289 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
270 290
291 MTH void tick (); // called every server tick to do housekeeping etc.
292
271 MTH static client *create (int fd, const char *peername); 293 MTH static client *create (int fd, const char *peername);
272 294
273protected: 295protected:
274 client (int fd, const char *from_ip); 296 client (int fd, const char *from_ip);
275 ~client (); 297 ~client ();
… …
277 299
278#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 300#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
279 ( ((__type)>0) &&\ 301 ( ((__type)>0) &&\
280 ((__sockPtr)->has_readable_type) && \ 302 ((__sockPtr)->has_readable_type) && \
281 ((__sockPtr)->supported_readables & (1<<(__type))) ) 303 ((__sockPtr)->supported_readables & (1<<(__type))) )
282
283/* Bitmask for the faces_sent[] array - what
284 * portion of the face have we sent?
285 */
286#define NS_FACESENT_FACE 0x1
287#define NS_FACESENT_SMOOTH 0x2
288 304
289/* Constants in the form EMI_ is for extended map infos. 305/* Constants in the form EMI_ is for extended map infos.
290 * Even if the client select the additionnal infos it wants 306 * Even if the client select the additionnal infos it wants
291 * on the map, there may exist cases where this whole info 307 * on the map, there may exist cases where this whole info
292 * is not given in one buch but in separate bunches. This 308 * is not given in one buch but in separate bunches. This

Diff Legend

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