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.6 by root, Sat Dec 16 18:39:26 2006 UTC vs.
Revision 1.7 by root, Sat Dec 16 21:40:26 2006 UTC

… …
23 23
24#ifndef CLIENT_H 24#ifndef CLIENT_H
25#define CLIENT_H 25#define CLIENT_H
26 26
27#include <deque> 27#include <deque>
28#include <bitset>
28 29
29// (possibly) max. number of objects "per page" in the ground container 30// (possibly) max. number of objects "per page" in the ground container
30#define NUM_LOOK_OBJECTS 50 31#define NUM_LOOK_OBJECTS 50
31 32
32struct MapCell 33struct MapCell
… …
120ACC_CLASS (client) // should become player when newsocket is a baseclass of player 121ACC_CLASS (client) // should become player when newsocket is a baseclass of player
121struct client : zero_initialised, attachable_base 122struct client : zero_initialised, attachable_base
122{ 123{
123 enum Sock_Status status; 124 enum Sock_Status status;
124 int ACC (RW, fd); 125 int ACC (RW, fd);
125 unsigned int inbuf_len; // number of bytes valid in inbuf 126 unsigned int inbuf_len; // number of bytes valid in inbuf
126 struct Map lastmap;
127 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */
128 uint8 *faces_sent; /* This is a bitmap on sent face status */ 127 uint8 *faces_sent; // This is a bitmap on sent face status
129 uint8 anims_sent[MAXANIMNUM];
130 struct statsinfo stats; 128 struct statsinfo stats;
131 129
132 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 130 char *ACC (RW, host); /* Which host it is connected from (ip address) */
133 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 131 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
134 Buffer outputbuffer; /* For undeliverable data */ 132 Buffer outputbuffer;
135 133
136 bool ACC (RW, facecache); /* If true, client is caching images */ 134 bool ACC (RW, facecache); /* If true, client is caching images */
137 bool ACC (RW, sent_scroll); 135 bool ACC (RW, sent_scroll);
138 bool ACC (RW, sound); /* does the client want sound */ 136 bool ACC (RW, sound); /* does the client want sound */
139 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */ 137 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
… …
164 162
165 maptile *ACC (RW, current_map); // CF+ last/current player map 163 maptile *ACC (RW, current_map); // CF+ last/current player map
166 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 164 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
167 char ACC (RW, version)[64]; // CF+ client name/version 165 char ACC (RW, version)[64]; // CF+ client name/version
168 166
169 // if we get an incomplete packet, this is used to hold the data.
170 // we add 2 byte for the header, one for the trailing 0 byte
171 uint8 inbuf[MAXSOCKBUF + 2 + 1];
172 player *ACC (RO, pl);//TODO should not be here, preferably 167 player *ACC (RO, pl);//TODO should not be here, preferably
173 168
174 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 169 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
175 170
176 client (int fd, const char *from_ip); 171 client (int fd, const char *from_ip);
… …
200 195
201 void send_packet (const char *buf); 196 void send_packet (const char *buf);
202 void send_packet (const char *buf, int len); 197 void send_packet (const char *buf, int len);
203 void send_packet_printf (const char *format, ...); 198 void send_packet_printf (const char *format, ...);
204 void send_packet (packet &sl); 199 void send_packet (packet &sl);
200
201 // large structures at the end please
202 struct Map lastmap;
203 std::bitset<MAXANIMNUM> anims_sent;
204 // if we get an incomplete packet, this is used to hold the data.
205 // we add 2 byte for the header, one for the trailing 0 byte
206 uint8 inbuf[MAXSOCKBUF + 2 + 1];
207
205}; 208};
206 209
207#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 210#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
208 ( ((__type)>0) &&\ 211 ( ((__type)>0) &&\
209 ((__sockPtr)->has_readable_type) && \ 212 ((__sockPtr)->has_readable_type) && \

Diff Legend

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