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.48 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.49 by root, Wed Apr 25 18:47:50 2007 UTC

… …
68 * instead of having a bunch of different fields that needed to 68 * instead of having a bunch of different fields that needed to
69 * get toggled. 69 * get toggled.
70 */ 70 */
71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
72 72
73/* The following is the setup for a ring buffer for storing output
74 * data that the OS can't handle right away.
75 */
76struct Buffer
77{
78 char data[SOCKETBUFSIZE];
79 int start;
80 int len;
81};
82
83// states the socket can be in 73// states the socket can be in
84enum { 74enum {
85 ST_DEAD, // socket is dead 75 ST_DEAD, // socket is dead
86 ST_SETUP, // initial handshake / setup / login 76 ST_SETUP, // initial handshake / setup / login
87 ST_PLAYING, // logged in an playing 77 ST_PLAYING, // logged in an playing
… …
164 int ACC (RW, fd); 154 int ACC (RW, fd);
165 unsigned int inbuf_len; // number of bytes valid in inbuf 155 unsigned int inbuf_len; // number of bytes valid in inbuf
166 statsinfo stats; 156 statsinfo stats;
167 int ACC (RO, active); 157 int ACC (RO, active);
168 158
169 Buffer outputbuffer; 159 /* The following is the setup for a ring buffer for storing output
160 * data that the OS can't handle right away.
161 */
162 struct
163 {
164 char data[SOCKETBUFSIZE];
165 int start;
166 int len;
167 } outputbuffer;
170 168
171 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 169 char *ACC (RW, host); /* Which host it is connected from (ip address) */
172 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ 170 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
173 171
174 sint8 ACC (RW, last_level); /* Last level we sent to client */ 172 sint8 ACC (RW, last_level); /* Last level we sent to client */
… …
223 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 */
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 shstr ACC (RW, version); // CF+ client name/version
229 uint8 ACC (RW, faceset); // CF+ selected faceset 227 uint8 ACC (RW, faceset); // CF+ selected faceset
230 228
231 player_ptr ACC (RO, pl); 229 player_ptr ACC (RO, pl);
232 230
233 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 */
… …
259 std::bitset<MAX_FACES> faces_sent; 257 std::bitset<MAX_FACES> faces_sent;
260 258
261 // if we get an incomplete packet, this is used to hold the data. 259 // if we get an incomplete packet, this is used to hold the data.
262 // we add 2 byte for the header, one for the trailing 0 byte 260 // we add 2 byte for the header, one for the trailing 0 byte
263 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 261 uint8 inbuf[MAXSOCKBUF + 2 + 1];
262
263 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
264 struct msg_buf
265 {
266 tick_t expire;
267 int len;
268 int count;
269 char msg[MSG_BUF_SIZE];
270 } msgbuf[MSG_BUF_COUNT];
271
272 MTH bool msg_suppressed (const char *msg);
264 273
265 bool may_execute (const packet_type *pkt) const; 274 bool may_execute (const packet_type *pkt) const;
266 void execute (const packet_type *pkt, char *data, int datalen); 275 void execute (const packet_type *pkt, char *data, int datalen);
267 276
268 void queue_command (packet_type *handler, char *data, int datalen); 277 void queue_command (packet_type *handler, char *data, int datalen);

Diff Legend

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