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.28 by root, Sun Feb 4 21:02:54 2007 UTC vs.
Revision 1.33 by root, Mon Mar 12 01:13:10 2007 UTC

… …
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]; 40 uint16 smooth[MAP_LAYERS];
41 unsigned char stat_hp; // health of something in this space, or 0 41 unsigned char stat_hp; // health of something in this space, or 0
42 unsigned char flags; 42 unsigned char flags;
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};
… …
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
… …
219 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 210 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
220 enum MapMode mapmode; /* Type of map commands the client wants. */ 211 enum MapMode mapmode; /* Type of map commands the client wants. */
221 uint16 ACC (RW, look_position); /* start of drawing of look window */ 212 uint16 ACC (RW, look_position); /* start of drawing of look window */
222 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 213 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 */ 214 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 215
226 maptile *ACC (RW, current_map); // CF+ last/current player map 216 maptile *ACC (RW, current_map); // CF+ last/current player map
217 region *ACC (RW, current_region); // CF+ last/current player region
227 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 218 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
228 char ACC (RW, version)[64]; // CF+ client name/version 219 char ACC (RW, version)[64]; // CF+ client name/version
220 uint8 ACC (RW, faceset); // CF+ selected faceset
229 221
230 player_ptr ACC (RO, pl); 222 player_ptr ACC (RO, pl);
231 223
232 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 224 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
233 225
234 void do_destroy (); 226 void do_destroy ();
235 void gather_callbacks (AV *&callbacks, event_type event) const; 227 void gather_callbacks (AV *&callbacks, event_type event) const;
236 228
229 iow socket_ev; void socket_cb (iow &w, int got);
237 iw cmd_ev; void cmd_cb (iw &w); 230 iw cmd_ev; void cmd_cb (iw &w);
238 iow socket_ev; void socket_cb (iow &w, int got); 231 client_container cc_inv, cc_other;
239 232
240 std::deque< command, slice_allocator<command> > cmd_queue; 233 std::deque< command, slice_allocator<command> > cmd_queue;
241 234
242 // large structures at the end please 235 // large structures at the end please
243 struct Map lastmap; 236 struct Map lastmap;
244 std::bitset<MAXANIMNUM> anims_sent; 237 std::bitset<MAXANIMNUM> anims_sent;
238 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status
245 // if we get an incomplete packet, this is used to hold the data. 239 // if we get an incomplete packet, this is used to hold the data.
246 // we add 2 byte for the header, one for the trailing 0 byte 240 // we add 2 byte for the header, one for the trailing 0 byte
247 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 241 uint8 inbuf[MAXSOCKBUF + 2 + 1];
248 242
249 bool may_execute (const packet_type *pkt) const; 243 bool may_execute (const packet_type *pkt) const;
… …
320 314
321#define FACE_TYPES 1 315#define FACE_TYPES 1
322#define PNG_FACE_INDEX 0 316#define PNG_FACE_INDEX 0
323 317
324#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 318#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
325#define VERSION_SC 1027 319#define VERSION_SC 1026
320//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
326#define VERSION_INFO "Crossfire+ Server" 321#define VERSION_INFO "Crossfire+ Server"
327 322
328typedef object_vector<client, &client::active> sockvec; 323typedef object_vector<client, &client::active> sockvec;
329 324
330extern sockvec clients; 325extern sockvec clients;
331 326
332#define for_all_clients(var) \ 327#define for_all_clients(var) \
333 for (int _i = 0; _i < clients.size (); ++_i) \ 328 for (int _i = 0; _i < clients.size (); ++_i) \
334 declvar (client *, var, clients [_i]) 329 declvar (client *, var, clients [_i])
335 330
336extern int nrofpixmaps; //TODO: hrmpf, should go
337
338#endif 331#endif
339 332

Diff Legend

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