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.29 by root, Thu Feb 15 04:04:22 2007 UTC vs.
Revision 1.42 by root, Mon Apr 2 18:04:46 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 uint16 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/* This basically defines the largest size an
46 * archetype may be - it is used for allocation of
47 * some structures, as well as determining how far
48 * we should look for the heads of big images.
49 */
50#define MAX_HEAD_OFFSET 8
51
52#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 45#define MAX_CLIENT_X MAP_CLIENT_X
53#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 46#define MAX_CLIENT_Y MAP_CLIENT_Y
54 47
55struct Map 48struct Map
56{ 49{
57 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 50 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
58}; 51};
59 52
60/* True max is 16383 given current map compaction method */ 53/* True max is 16383 given current map compaction method */
61# define MAXANIMNUM 2000 54#define MAXANIMNUM 10000
62 55
63struct statsinfo 56struct statsinfo
64{ 57{
65 char *range, *title; 58 char *range, *title;
66}; 59};
… …
73 66
74/* 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
75 * instead of having a bunch of different fields that needed to 68 * instead of having a bunch of different fields that needed to
76 * get toggled. 69 * get toggled.
77 */ 70 */
78enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
79 72
80/* 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
81 * data that the OS can't handle right away. 74 * data that the OS can't handle right away.
82 */ 75 */
83struct Buffer 76struct Buffer
… …
169INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player 162INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
170struct client : zero_initialised, attachable 163struct client : zero_initialised, attachable
171{ 164{
172 int ACC (RW, fd); 165 int ACC (RW, fd);
173 unsigned int inbuf_len; // number of bytes valid in inbuf 166 unsigned int inbuf_len; // number of bytes valid in inbuf
174 uint8 *faces_sent; // This is a bitmap on sent face status
175 statsinfo stats; 167 statsinfo stats;
176 int ACC (RO, active); 168 int ACC (RO, active);
177 169
178 client_container cc_inv, cc_other;
179 Buffer outputbuffer; 170 Buffer outputbuffer;
180 171
181 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 172 char *ACC (RW, host); /* Which host it is connected from (ip address) */
182 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ 173 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
183 174
… …
192 living ACC (RO, last_stats); /* Last stats as sent to client */ 183 living ACC (RO, last_stats); /* Last stats as sent to client */
193 float ACC (RW, last_speed); /* Last speed as sent to client */ 184 float ACC (RW, last_speed); /* Last speed as sent to client */
194 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 */
195 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 */
196 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
197 bool ACC (RW, afk); /* player is afk */ 193 bool ACC (RW, afk); /* player is afk */
198 bool ACC (RW, facecache); /* If true, client is caching images */ 194 bool ACC (RW, facecache); /* If true, client is caching images */
199 bool ACC (RW, sent_scroll); 195 bool ACC (RW, sent_scroll);
200 bool ACC (RW, sound); /* does the client want sound */ 196 bool ACC (RW, sound); /* does the client want sound */
201 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 */
202 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 198 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
203 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
204 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 200 bool ACC (RW, extcmd); // call into extensions/plugins
205 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 201 bool ACC (RW, extmap); // extend map comamnd with extra data
206 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 202 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
207 bool ACC (RW, darkness); /* True if client wants darkness information */ 203 bool ACC (RW, darkness); /* True if client wants darkness information */
208 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 204 bool ACC (RW, image2); /* Client wants image2/face2 commands */
209 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 */
210 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 */
211 /* used to arrange text in books, scrolls, or scripted dialogs */ 207 /* used to arrange text in books, scrolls, or scripted dialogs */
… …
213 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 */
214 /* Below are flags for extedend infos to pass to client 210 /* Below are flags for extedend infos to pass to client
215 * with S->C mapextended command */ 211 * with S->C mapextended command */
216 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 212 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
217 213
214 bool ACC (RW, force_newmap); // force a newmap before next map update
218 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 */
219 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 */
220 enum MapMode mapmode; /* Type of map commands the client wants. */
221 uint16 ACC (RW, look_position); /* start of drawing of look window */ 217 uint16 ACC (RW, look_position); /* start of drawing of look window */
218 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
222 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 219 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
223 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 220 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
224 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
225 221
226 maptile *ACC (RW, current_map); // CF+ last/current player map 222 maptile *ACC (RW, current_map); // CF+ last/current player map
227 region *ACC (RW, current_region); // CF+ last/current player region 223 region *ACC (RW, current_region); // CF+ last/current player region
228 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 224 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
229 char ACC (RW, version)[64]; // CF+ client name/version 225 char ACC (RW, version)[64]; // CF+ client name/version
226 uint8 ACC (RW, faceset); // CF+ selected faceset
230 227
231 player_ptr ACC (RO, pl); 228 player_ptr ACC (RO, pl);
232 229
233 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 230 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
231
232 int ACC (RW, max_rate); // max. # of bytes to send per tick
233 faceidx ACC (RW, scrub_idx); // which face to send next
234 int ACC (RW, bg_scrub); // how many ticks till the next background face send
235 std::vector<faceidx> askface; // which faces have been requested by the client
234 236
235 void do_destroy (); 237 void do_destroy ();
236 void gather_callbacks (AV *&callbacks, event_type event) const; 238 void gather_callbacks (AV *&callbacks, event_type event) const;
237 239
240 iow socket_ev; void socket_cb (iow &w, int got);
238 iw cmd_ev; void cmd_cb (iw &w); 241 iw cmd_ev; void cmd_cb (iw &w);
239 iow socket_ev; void socket_cb (iow &w, int got); 242 client_container cc_inv, cc_other;
240 243
241 std::deque< command, slice_allocator<command> > cmd_queue; 244 std::deque< command, slice_allocator<command> > cmd_queue;
242 245
243 // large structures at the end please 246 // large structures at the end please
244 struct Map lastmap; 247 struct Map lastmap;
245 std::bitset<MAXANIMNUM> anims_sent; 248 std::bitset<MAXANIMNUM> anims_sent;
249 std::bitset<MAX_FACES> faces_sent;
250
246 // if we get an incomplete packet, this is used to hold the data. 251 // if we get an incomplete packet, this is used to hold the data.
247 // we add 2 byte for the header, one for the trailing 0 byte 252 // we add 2 byte for the header, one for the trailing 0 byte
248 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 253 uint8 inbuf[MAXSOCKBUF + 2 + 1];
249 254
250 bool may_execute (const packet_type *pkt) const; 255 bool may_execute (const packet_type *pkt) const;
… …
261 int next_packet (); // returns length of packet or 0 266 int next_packet (); // returns length of packet or 0
262 void skip_packet (int len); // we have processed the packet, skip it 267 void skip_packet (int len); // we have processed the packet, skip it
263 268
264 MTH void flush (); 269 MTH void flush ();
265 MTH void write_outputbuffer (); 270 MTH void write_outputbuffer ();
271 MTH int outputbuffer_len () const { return outputbuffer.len; }
266 void send (void *buf_, int len); 272 void send (void *buf_, int len);
267 273
268 void send_packet (const char *buf); 274 void send_packet (const char *buf);
269 void send_packet (const char *buf, int len); 275 void send_packet (const char *buf, int len);
270 void send_packet_printf (const char *format, ...); 276 void send_packet_printf (const char *format, ...);
271 void send_packet (packet &sl); 277 void send_packet (packet &sl);
272 278
279 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
280 MTH void send_face (faceidx facenum);
281 MTH void send_image (faceidx facenum);
282 MTH void send_faces (object *ob);
283 MTH void send_animation (short anim_num);
284
273 // called when something under the player changes 285 // called when something under the player changes
274 MTH void floorbox_update () { update_look = 1; } 286 MTH void floorbox_update () { update_look = 1; }
275 // called when the player has been moved 287 // called when the player has been moved
276 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 288 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
277 289
290 MTH void tick (); // called every server tick to do housekeeping etc.
291
278 MTH static client *create (int fd, const char *peername); 292 MTH static client *create (int fd, const char *peername);
279 293
280protected: 294protected:
281 client (int fd, const char *from_ip); 295 client (int fd, const char *from_ip);
282 ~client (); 296 ~client ();
… …
284 298
285#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 299#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
286 ( ((__type)>0) &&\ 300 ( ((__type)>0) &&\
287 ((__sockPtr)->has_readable_type) && \ 301 ((__sockPtr)->has_readable_type) && \
288 ((__sockPtr)->supported_readables & (1<<(__type))) ) 302 ((__sockPtr)->supported_readables & (1<<(__type))) )
289
290/* Bitmask for the faces_sent[] array - what
291 * portion of the face have we sent?
292 */
293#define NS_FACESENT_FACE 0x1
294#define NS_FACESENT_SMOOTH 0x2
295 303
296/* Constants in the form EMI_ is for extended map infos. 304/* Constants in the form EMI_ is for extended map infos.
297 * Even if the client select the additionnal infos it wants 305 * Even if the client select the additionnal infos it wants
298 * on the map, there may exist cases where this whole info 306 * on the map, there may exist cases where this whole info
299 * is not given in one buch but in separate bunches. This 307 * is not given in one buch but in separate bunches. This
… …
321 329
322#define FACE_TYPES 1 330#define FACE_TYPES 1
323#define PNG_FACE_INDEX 0 331#define PNG_FACE_INDEX 0
324 332
325#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 333#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
326#define VERSION_SC 1027 334#define VERSION_SC 1026
335//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
327#define VERSION_INFO "Crossfire+ Server" 336#define VERSION_INFO "Crossfire+ Server"
328 337
329typedef object_vector<client, &client::active> sockvec; 338typedef object_vector<client, &client::active> sockvec;
330 339
331extern sockvec clients; 340extern sockvec clients;
332 341
333#define for_all_clients(var) \ 342#define for_all_clients(var) \
334 for (int _i = 0; _i < clients.size (); ++_i) \ 343 for (int _i = 0; _i < clients.size (); ++_i) \
335 declvar (client *, var, clients [_i]) 344 declvar (client *, var, clients [_i])
336 345
337extern int nrofpixmaps; //TODO: hrmpf, should go
338
339#endif 346#endif
340 347

Diff Legend

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