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.16 by root, Fri Dec 22 16:34:00 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_CONFIRM_QUIT,
98 ST_CHANGE_CLASS,
99 ST_CONFIGURE,
100 ST_GET_PARTY_PASSWORD,
90}; 101};
91 102
92// a handler for a specific type of packet 103// a handler for a specific type of packet
93enum { 104enum {
94 PF_PLAYER = 0x01, // must have valid player / will by synchronised 105 PF_PLAYER = 0x01, // must have valid player / will by synchronised
… …
113 { 124 {
114 sfree<char> (data, datalen + 1); 125 sfree<char> (data, datalen + 1);
115 } 126 }
116}; 127};
117 128
129struct refitem
130{
131 object_ptr op;
132};
133
118// this represents a container on the client side. 134// this represents a container on the client side.
119// right now, there are only ever two of them: 135// right now, there are only ever two of them:
120// the inventory and the floor/open container 136// the inventory and the floor/open container
121//TODO: unused as of yet 137//TODO: unused as of yet
122struct client_container 138struct client_container : vector< refitem, slice_allocator<refitem> >
123{ 139{
140 client *ns;
124 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type; 141 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
125 142
143 bool item_changed; // one of the items in here possibly changed
144
126 // for mapspace and container 145 // for mapspace and container
127 sint16 x, y; 146 int x, y;
128 maptile *map; 147 maptile *map;
129 148
130 // for container 149 // for container
131 object *env; 150 object *env;
151
152 client_container (client *ns)
153 : ns (ns), type (CC_NONE) { }
154
155 tag_t tag () const;
156
157 inline iterator merge_item (iterator i, object *op);
158
159 void clear ();
160 void update ();
161
162 void set_mapspace (maptile *map, int x, int y);
163 void set_container (object *env);
132}; 164};
133 165
134/* how many times we are allowed to give the wrong password before being kicked. */ 166/* how many times we are allowed to give the wrong password before being kicked. */
135#define MAX_PASSWORD_FAILURES 5 167#define MAX_PASSWORD_FAILURES 5
136 168
137ACC_CLASS (client) // should become player when newsocket is a baseclass of player 169ACC_CLASS (client) // should become player when newsocket is a baseclass of player
138struct client : zero_initialised, attachable_base 170struct client : zero_initialised, attachable<client>
139{ 171{
140 enum Sock_Status status;
141 int ACC (RW, fd); 172 int ACC (RW, fd);
142 unsigned int inbuf_len; // number of bytes valid in inbuf 173 unsigned int inbuf_len; // number of bytes valid in inbuf
143 uint8 *faces_sent; // This is a bitmap on sent face status 174 uint8 *faces_sent; // This is a bitmap on sent face status
144 statsinfo stats; 175 statsinfo stats;
145 176
146 client_container cc_inv, cc_other; 177 client_container cc_inv, cc_other;
178 Buffer outputbuffer;
147 179
148 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 180 char *ACC (RW, host); /* Which host it is connected from (ip address) */
181 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 */ 182 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */
150 Buffer outputbuffer;
151 183
152 bool ACC (RW, facecache); /* If true, client is caching images */ 184 bool ACC (RW, facecache); /* If true, client is caching images */
153 bool ACC (RW, sent_scroll); 185 bool ACC (RW, sent_scroll);
154 bool ACC (RW, sound); /* does the client want sound */ 186 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 */ 187 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 */ 219 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
188 220
189 client (int fd, const char *from_ip); 221 client (int fd, const char *from_ip);
190 ~client (); 222 ~client ();
191 void destroy (); 223 void destroy ();
224 bool destroyed () const { return state == ST_DEAD; }
192 225
193 iw cmd_ev; void cmd_cb (iw &w); 226 iw cmd_ev; void cmd_cb (iw &w);
194 iow socket_ev; void socket_cb (iow &w, int got); 227 iow socket_ev; void socket_cb (iow &w, int got);
195 228
196 std::deque< command, slice_allocator<command> > cmd_queue; 229 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 230
224 // large structures at the end please 231 // large structures at the end please
225 struct Map lastmap; 232 struct Map lastmap;
226 std::bitset<MAXANIMNUM> anims_sent; 233 std::bitset<MAXANIMNUM> anims_sent;
227 // if we get an incomplete packet, this is used to hold the data. 234 // 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 235 // we add 2 byte for the header, one for the trailing 0 byte
229 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 236 uint8 inbuf[MAXSOCKBUF + 2 + 1];
237
238 bool may_execute (const packet_type *pkt) const;
239 void execute (const packet_type *pkt, char *data, int datalen);
240
241 void queue_command (packet_type *handler, char *data, int datalen);
242 bool handle_command ();
243 // resets movement state
244 void reset_state ();
245
246 bool handle_packet ();
247 int next_packet (); // returns length of packet or 0
248 void skip_packet (int len); // we have processed the packet, skip it
249
250 void flush ();
251 void write_outputbuffer ();
252 void send (void *buf_, int len);
253
254 void send_packet (const char *buf);
255 void send_packet (const char *buf, int len);
256 void send_packet_printf (const char *format, ...);
257 void send_packet (packet &sl);
258
259 // called when something under the player changes
260 void floorbox_update () { update_look = 1; }
261 // called when the player has been moved
262 void floorbox_reset () { look_position = 0; floorbox_update (); }
263
264 static client *create (int fd, const char *peername);
230}; 265};
231 266
232#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 267#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
233 ( ((__type)>0) &&\ 268 ( ((__type)>0) &&\
234 ((__sockPtr)->has_readable_type) && \ 269 ((__sockPtr)->has_readable_type) && \

Diff Legend

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