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.31 by root, Sat Mar 10 19:48:16 2007 UTC vs.
Revision 1.32 by root, Sun Mar 11 02:12:44 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
… …
169INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player 169INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
170struct client : zero_initialised, attachable 170struct client : zero_initialised, attachable
171{ 171{
172 int ACC (RW, fd); 172 int ACC (RW, fd);
173 unsigned int inbuf_len; // number of bytes valid in inbuf 173 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; 174 statsinfo stats;
176 int ACC (RO, active); 175 int ACC (RO, active);
177 176
178 Buffer outputbuffer; 177 Buffer outputbuffer;
179 178
… …
218 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 217 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
219 enum MapMode mapmode; /* Type of map commands the client wants. */ 218 enum MapMode mapmode; /* Type of map commands the client wants. */
220 uint16 ACC (RW, look_position); /* start of drawing of look window */ 219 uint16 ACC (RW, look_position); /* start of drawing of look window */
221 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 */
222 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 */
223 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
224 222
225 maptile *ACC (RW, current_map); // CF+ last/current player map 223 maptile *ACC (RW, current_map); // CF+ last/current player map
226 region *ACC (RW, current_region); // CF+ last/current player region 224 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 225 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
228 char ACC (RW, version)[64]; // CF+ client name/version 226 char ACC (RW, version)[64]; // CF+ client name/version
227 uint8 ACC (RW, faceset); // CF+ selected faceset
229 228
230 player_ptr ACC (RO, pl); 229 player_ptr ACC (RO, pl);
231 230
232 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 */
233 232
… …
241 std::deque< command, slice_allocator<command> > cmd_queue; 240 std::deque< command, slice_allocator<command> > cmd_queue;
242 241
243 // large structures at the end please 242 // large structures at the end please
244 struct Map lastmap; 243 struct Map lastmap;
245 std::bitset<MAXANIMNUM> anims_sent; 244 std::bitset<MAXANIMNUM> anims_sent;
245 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status
246 // if we get an incomplete packet, this is used to hold the data. 246 // 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 247 // we add 2 byte for the header, one for the trailing 0 byte
248 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 248 uint8 inbuf[MAXSOCKBUF + 2 + 1];
249 249
250 bool may_execute (const packet_type *pkt) const; 250 bool may_execute (const packet_type *pkt) const;
… …
333 333
334#define for_all_clients(var) \ 334#define for_all_clients(var) \
335 for (int _i = 0; _i < clients.size (); ++_i) \ 335 for (int _i = 0; _i < clients.size (); ++_i) \
336 declvar (client *, var, clients [_i]) 336 declvar (client *, var, clients [_i])
337 337
338extern int nrofpixmaps; //TODO: hrmpf, should go
339
340#endif 338#endif
341 339

Diff Legend

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