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.5 by root, Sat Dec 16 03:21:08 2006 UTC vs.
Revision 1.9 by root, Tue Dec 19 04:58:04 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
… …
87 int len; 88 int len;
88}; 89};
89 90
90// a handler for a specific type of packet 91// a handler for a specific type of packet
91enum { 92enum {
92 PF_PLAYER = 0x01, // must have valid player 93 PF_PLAYER = 0x01, // must have valid player / will by synchronised
93 PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately
94 PF_PLAYING = 0x04, // must be in playing state 94 PF_PLAYING = 0x02, // must be in playing state
95}; 95};
96 96
97struct packet_type 97struct packet_type
98{ 98{
99 const char *name; 99 const char *name;
… …
106 tstamp stamp; 106 tstamp stamp;
107 const packet_type *handler; 107 const packet_type *handler;
108 char *data; 108 char *data;
109 int datalen; 109 int datalen;
110 110
111 command (tstamp stamp, const packet_type *handler, char *data, int datalen) 111 ~command ()
112 : stamp (stamp), handler (handler), data (data), datalen (datalen)
113 { 112 {
113 sfree<char> (data, datalen + 1);
114 } 114 }
115}; 115};
116 116
117/* how many times we are allowed to give the wrong password before being kicked. */ 117/* how many times we are allowed to give the wrong password before being kicked. */
118#define MAX_PASSWORD_FAILURES 5 118#define MAX_PASSWORD_FAILURES 5
… …
120ACC_CLASS (client) // should become player when newsocket is a baseclass of player 120ACC_CLASS (client) // should become player when newsocket is a baseclass of player
121struct client : zero_initialised, attachable_base 121struct client : zero_initialised, attachable_base
122{ 122{
123 enum Sock_Status status; 123 enum Sock_Status status;
124 int ACC (RW, fd); 124 int ACC (RW, fd);
125 unsigned int inbuf_len; // number of bytes valid in inbuf 125 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 */ 126 uint8 *faces_sent; // This is a bitmap on sent face status
129 uint8 anims_sent[MAXANIMNUM];
130 struct statsinfo stats; 127 struct statsinfo stats;
131 128
132 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 129 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 */ 130 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
134 Buffer outputbuffer; /* For undeliverable data */ 131 Buffer outputbuffer;
135 132
136 bool ACC (RW, facecache); /* If true, client is caching images */ 133 bool ACC (RW, facecache); /* If true, client is caching images */
137 bool ACC (RW, sent_scroll); 134 bool ACC (RW, sent_scroll);
138 bool ACC (RW, sound); /* does the client want sound */ 135 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 */ 136 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
… …
164 161
165 maptile *ACC (RW, current_map); // CF+ last/current player map 162 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 163 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
167 char ACC (RW, version)[64]; // CF+ client name/version 164 char ACC (RW, version)[64]; // CF+ client name/version
168 165
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 166 player *ACC (RO, pl);//TODO should not be here, preferably
173 167
174 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 168 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
175 169
176 client (int fd, const char *from_ip); 170 client (int fd, const char *from_ip);
… …
200 194
201 void send_packet (const char *buf); 195 void send_packet (const char *buf);
202 void send_packet (const char *buf, int len); 196 void send_packet (const char *buf, int len);
203 void send_packet_printf (const char *format, ...); 197 void send_packet_printf (const char *format, ...);
204 void send_packet (packet &sl); 198 void send_packet (packet &sl);
199
200 // large structures at the end please
201 struct Map lastmap;
202 std::bitset<MAXANIMNUM> anims_sent;
203 // if we get an incomplete packet, this is used to hold the data.
204 // we add 2 byte for the header, one for the trailing 0 byte
205 uint8 inbuf[MAXSOCKBUF + 2 + 1];
206
205}; 207};
206 208
207#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 209#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
208 ( ((__type)>0) &&\ 210 ( ((__type)>0) &&\
209 ((__sockPtr)->has_readable_type) && \ 211 ((__sockPtr)->has_readable_type) && \

Diff Legend

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