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.15 by root, Thu Dec 21 23:37:05 2006 UTC vs.
Revision 1.20 by root, Sat Dec 23 15:49:40 2006 UTC

… …
77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
78 78
79/* The following is the setup for a ring buffer for storing output 79/* The following is the setup for a ring buffer for storing output
80 * data that the OS can't handle right away. 80 * data that the OS can't handle right away.
81 */ 81 */
82
83struct Buffer 82struct Buffer
84{ 83{
85 char data[SOCKETBUFSIZE]; 84 char data[SOCKETBUFSIZE];
86 int start; 85 int start;
87 int len; 86 int len;
… …
92 ST_DEAD, // socket is dead 91 ST_DEAD, // socket is dead
93 ST_SETUP, // initial handshake / setup / login 92 ST_SETUP, // initial handshake / setup / login
94 ST_PLAYING, // logged in an playing 93 ST_PLAYING, // logged in an playing
95 ST_CUSTOM, // waiting for custom reply 94 ST_CUSTOM, // waiting for custom reply
96 95
97 ST_PLAY_AGAIN, 96 ST_CONFIRM_QUIT,
98 ST_ROLL_STAT,
99 ST_CHANGE_CLASS, 97 ST_CHANGE_CLASS,
100 ST_CONFIRM_QUIT,
101 ST_CONFIGURE,
102 ST_GET_NAME,
103 ST_GET_PASSWORD,
104 ST_CONFIRM_PASSWORD,
105 ST_GET_PARTY_PASSWORD, 98 ST_GET_PARTY_PASSWORD,
106}; 99};
107 100
108// a handler for a specific type of packet 101// a handler for a specific type of packet
109enum { 102enum {
… …
175struct client : zero_initialised, attachable<client> 168struct client : zero_initialised, attachable<client>
176{ 169{
177 int ACC (RW, fd); 170 int ACC (RW, fd);
178 unsigned int inbuf_len; // number of bytes valid in inbuf 171 unsigned int inbuf_len; // number of bytes valid in inbuf
179 uint8 *faces_sent; // This is a bitmap on sent face status 172 uint8 *faces_sent; // This is a bitmap on sent face status
180 statsinfo stats; 173 statsinfo stats;
181 174
182 client_container cc_inv, cc_other; 175 client_container cc_inv, cc_other;
183 Buffer outputbuffer; 176 Buffer outputbuffer;
184 177
185 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 178 char *ACC (RW, host); /* Which host it is connected from (ip address) */
186 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ 179 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
187 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 180 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
188 181
182 bool ACC (RW, afk); /* player is afk */
189 bool ACC (RW, facecache); /* If true, client is caching images */ 183 bool ACC (RW, facecache); /* If true, client is caching images */
190 bool ACC (RW, sent_scroll); 184 bool ACC (RW, sent_scroll);
191 bool ACC (RW, sound); /* does the client want sound */ 185 bool ACC (RW, sound); /* does the client want sound */
192 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
193 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 186 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
194 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 187 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
195 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 188 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
196 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 189 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
197 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 190 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
… …
217 210
218 maptile *ACC (RW, current_map); // CF+ last/current player map 211 maptile *ACC (RW, current_map); // CF+ last/current player map
219 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 212 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
220 char ACC (RW, version)[64]; // CF+ client name/version 213 char ACC (RW, version)[64]; // CF+ client name/version
221 214
222 player *ACC (RO, pl);//TODO should not be here, preferably 215 player_ptr ACC (RO, pl);
223 216
224 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 217 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
225 218
226 client (int fd, const char *from_ip); 219 client (int fd, const char *from_ip);
227 ~client (); 220 ~client ();

Diff Legend

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