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.12 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.15 by root, Thu Dec 21 23:37:05 2006 UTC

… …
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#include <bitset>
29#include <list> 29#include <tr1/unordered_set>
30 30
31// (possibly) max. number of objects "per page" in the ground container 31// (possibly) max. number of objects "per page" in the ground container
32#define FLOORBOX_PAGESIZE 50 32#define FLOORBOX_PAGESIZE 50
33 33
34struct MapCell 34struct MapCell
… …
68 * current state. we set up our on buffers for sending/receiving, so we can 68 * current state. we set up our on buffers for sending/receiving, so we can
69 * handle some higher level functions. fd is the actual file descriptor we 69 * handle some higher level functions. fd is the actual file descriptor we
70 * are using. 70 * are using.
71 */ 71 */
72 72
73enum Sock_Status { Ns_Add, Ns_Dead };
74
75/* Only one map mode can actually be used, so lets make it a switch 73/* Only one map mode can actually be used, so lets make it a switch
76 * instead of having a bunch of different fields that needed to 74 * instead of having a bunch of different fields that needed to
77 * get toggled. 75 * get toggled.
78 */ 76 */
79enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 77enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
80 78
81/* The following is the setup for a ring buffer for storing outbut 79/* The following is the setup for a ring buffer for storing output
82 * data that the OS can't handle right away. 80 * data that the OS can't handle right away.
83 */ 81 */
84 82
85struct Buffer 83struct Buffer
86{ 84{
87 char data[SOCKETBUFSIZE]; 85 char data[SOCKETBUFSIZE];
88 int start; 86 int start;
89 int len; 87 int len;
88};
89
90// states the socket can be in
91enum {
92 ST_DEAD, // socket is dead
93 ST_SETUP, // initial handshake / setup / login
94 ST_PLAYING, // logged in an playing
95 ST_CUSTOM, // waiting for custom reply
96
97 ST_PLAY_AGAIN,
98 ST_ROLL_STAT,
99 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,
90}; 106};
91 107
92// a handler for a specific type of packet 108// a handler for a specific type of packet
93enum { 109enum {
94 PF_PLAYER = 0x01, // must have valid player / will by synchronised 110 PF_PLAYER = 0x01, // must have valid player / will by synchronised
… …
113 { 129 {
114 sfree<char> (data, datalen + 1); 130 sfree<char> (data, datalen + 1);
115 } 131 }
116}; 132};
117 133
134struct refitem
135{
136 object_ptr op;
137};
138
118// this represents a container on the client side. 139// this represents a container on the client side.
119// right now, there are only ever two of them: 140// right now, there are only ever two of them:
120// the inventory and the floor/open container 141// the inventory and the floor/open container
121//TODO: unused as of yet 142//TODO: unused as of yet
122struct client_container 143struct client_container : vector< refitem, slice_allocator<refitem> >
123{ 144{
145 client *ns;
124 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type; 146 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
125 147
148 bool item_changed; // one of the items in here possibly changed
149
126 // for mapspace and container 150 // for mapspace and container
127 sint16 x, y; 151 int x, y;
128 maptile *map; 152 maptile *map;
129 153
130 // for container 154 // for container
131 object *env; 155 object *env;
156
157 client_container (client *ns)
158 : ns (ns), type (CC_NONE) { }
159
160 tag_t tag () const;
161
162 inline iterator merge_item (iterator i, object *op);
163
164 void clear ();
165 void update ();
166
167 void set_mapspace (maptile *map, int x, int y);
168 void set_container (object *env);
132}; 169};
133 170
134/* how many times we are allowed to give the wrong password before being kicked. */ 171/* how many times we are allowed to give the wrong password before being kicked. */
135#define MAX_PASSWORD_FAILURES 5 172#define MAX_PASSWORD_FAILURES 5
136 173
137ACC_CLASS (client) // should become player when newsocket is a baseclass of player 174ACC_CLASS (client) // should become player when newsocket is a baseclass of player
138struct client : zero_initialised, attachable_base 175struct client : zero_initialised, attachable<client>
139{ 176{
140 enum Sock_Status status;
141 int ACC (RW, fd); 177 int ACC (RW, fd);
142 unsigned int inbuf_len; // number of bytes valid in inbuf 178 unsigned int inbuf_len; // number of bytes valid in inbuf
143 uint8 *faces_sent; // This is a bitmap on sent face status 179 uint8 *faces_sent; // This is a bitmap on sent face status
144 statsinfo stats; 180 statsinfo stats;
145 181
146 client_container cc_inv, cc_other; 182 client_container cc_inv, cc_other;
183 Buffer outputbuffer;
147 184
148 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 185 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 */
149 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 187 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
150 Buffer outputbuffer;
151 188
152 bool ACC (RW, facecache); /* If true, client is caching images */ 189 bool ACC (RW, facecache); /* If true, client is caching images */
153 bool ACC (RW, sent_scroll); 190 bool ACC (RW, sent_scroll);
154 bool ACC (RW, sound); /* does the client want sound */ 191 bool ACC (RW, sound); /* does the client want sound */
155 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */ 192 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
… …
187 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 224 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
188 225
189 client (int fd, const char *from_ip); 226 client (int fd, const char *from_ip);
190 ~client (); 227 ~client ();
191 void destroy (); 228 void destroy ();
229 bool destroyed () const { return state == ST_DEAD; }
192 230
193 iw cmd_ev; void cmd_cb (iw &w); 231 iw cmd_ev; void cmd_cb (iw &w);
194 iow socket_ev; void socket_cb (iow &w, int got); 232 iow socket_ev; void socket_cb (iow &w, int got);
195 233
196 std::deque< command, slice_allocator<command> > cmd_queue; 234 std::deque< command, slice_allocator<command> > cmd_queue;
197
198 // resets movement state
199 bool may_execute (const packet_type *pkt) const;
200 void execute (const packet_type *pkt, char *data, int datalen);
201
202 void queue_command (packet_type *handler, char *data, int datalen);
203 bool handle_command ();
204 void reset_state ();
205
206 bool handle_packet ();
207 int next_packet (); // returns length of packet or 0
208 void skip_packet (int len); // we have processed the packet, skip it
209
210 void flush ();
211 void write_outputbuffer ();
212 void send (void *buf_, int len);
213
214 void send_packet (const char *buf);
215 void send_packet (const char *buf, int len);
216 void send_packet_printf (const char *format, ...);
217 void send_packet (packet &sl);
218
219 // called when something under the player changes
220 void floorbox_update () { update_look = 1; }
221 // called when the player has been moved
222 void floorbox_reset () { look_position = 0; floorbox_update (); }
223 235
224 // large structures at the end please 236 // large structures at the end please
225 struct Map lastmap; 237 struct Map lastmap;
226 std::bitset<MAXANIMNUM> anims_sent; 238 std::bitset<MAXANIMNUM> anims_sent;
227 // if we get an incomplete packet, this is used to hold the data. 239 // if we get an incomplete packet, this is used to hold the data.
228 // we add 2 byte for the header, one for the trailing 0 byte 240 // we add 2 byte for the header, one for the trailing 0 byte
229 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 241 uint8 inbuf[MAXSOCKBUF + 2 + 1];
242
243 bool may_execute (const packet_type *pkt) const;
244 void execute (const packet_type *pkt, char *data, int datalen);
245
246 void queue_command (packet_type *handler, char *data, int datalen);
247 bool handle_command ();
248 // resets movement state
249 void reset_state ();
250
251 bool handle_packet ();
252 int next_packet (); // returns length of packet or 0
253 void skip_packet (int len); // we have processed the packet, skip it
254
255 void flush ();
256 void write_outputbuffer ();
257 void send (void *buf_, int len);
258
259 void send_packet (const char *buf);
260 void send_packet (const char *buf, int len);
261 void send_packet_printf (const char *format, ...);
262 void send_packet (packet &sl);
263
264 // called when something under the player changes
265 void floorbox_update () { update_look = 1; }
266 // called when the player has been moved
267 void floorbox_reset () { look_position = 0; floorbox_update (); }
268
269 static client *create (int fd, const char *peername);
230}; 270};
231 271
232#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 272#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
233 ( ((__type)>0) &&\ 273 ( ((__type)>0) &&\
234 ((__sockPtr)->has_readable_type) && \ 274 ((__sockPtr)->has_readable_type) && \

Diff Legend

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