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.17 by root, Sat Dec 23 00:14:29 2006 UTC vs.
Revision 1.21 by root, Mon Dec 25 11:25:49 2006 UTC

162}; 162};
163 163
164/* how many times we are allowed to give the wrong password before being kicked. */ 164/* how many times we are allowed to give the wrong password before being kicked. */
165#define MAX_PASSWORD_FAILURES 5 165#define MAX_PASSWORD_FAILURES 5
166 166
167ACC_CLASS (client) // should become player when newsocket is a baseclass of player 167INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
168struct client : zero_initialised, attachable<client> 168struct client : zero_initialised, attachable
169{ 169{
170 int ACC (RW, fd); 170 int ACC (RW, fd);
171 unsigned int inbuf_len; // number of bytes valid in inbuf 171 unsigned int inbuf_len; // number of bytes valid in inbuf
172 uint8 *faces_sent; // This is a bitmap on sent face status 172 uint8 *faces_sent; // This is a bitmap on sent face status
173 statsinfo stats; 173 statsinfo stats;
174 174
175 client_container cc_inv, cc_other; 175 client_container cc_inv, cc_other;
176 Buffer outputbuffer; 176 Buffer outputbuffer;
177 177
178 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) */
179 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 */
180 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 */
181 181
182 bool ACC (RW, afk); /* player is afk */
182 bool ACC (RW, facecache); /* If true, client is caching images */ 183 bool ACC (RW, facecache); /* If true, client is caching images */
183 bool ACC (RW, sent_scroll); 184 bool ACC (RW, sent_scroll);
184 bool ACC (RW, sound); /* does the client want sound */ 185 bool ACC (RW, sound); /* does the client want sound */
185 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
186 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 */
187 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 */
188 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 */
189 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 189 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
190 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 190 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
210 210
211 maptile *ACC (RW, current_map); // CF+ last/current player map 211 maptile *ACC (RW, current_map); // CF+ last/current player map
212 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
213 char ACC (RW, version)[64]; // CF+ client name/version 213 char ACC (RW, version)[64]; // CF+ client name/version
214 214
215 player *ACC (RO, pl);//TODO should not be here, preferably 215 player_ptr ACC (RO, pl);
216 216
217 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 */
218 218
219 client (int fd, const char *from_ip); 219 client (int fd, const char *from_ip);
220 ~client (); 220 ~client ();
221 void destroy (); 221 void do_destroy ();
222 bool destroyed () const { return state == ST_DEAD; } 222 void gather_callbacks (AV *&callbacks, event_type event) const;
223 223
224 iw cmd_ev; void cmd_cb (iw &w); 224 iw cmd_ev; void cmd_cb (iw &w);
225 iow socket_ev; void socket_cb (iow &w, int got); 225 iow socket_ev; void socket_cb (iow &w, int got);
226 226
227 std::deque< command, slice_allocator<command> > cmd_queue; 227 std::deque< command, slice_allocator<command> > cmd_queue;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines