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.28 by root, Sun Feb 4 21:02:54 2007 UTC vs.
Revision 1.37 by root, Wed Mar 14 04:12:28 2007 UTC

… …
33#define FLOORBOX_PAGESIZE 50 33#define FLOORBOX_PAGESIZE 50
34 34
35struct MapCell 35struct MapCell
36{ 36{
37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
38 int count; /* This is really darkness in the map1 command */ 38 int count; /* This is really darkness in the map1 command */
39 uint16 faces[MAP_LAYERS]; 39 faceidx faces[MAP_LAYERS];
40 uint16 smooth[MAP_LAYERS];
41 unsigned char stat_hp; // health of something in this space, or 0 40 unsigned char stat_hp; // health of something in this space, or 0
42 unsigned char flags; 41 unsigned char flags;
42 uint8_t smooth[MAP_LAYERS];
43}; 43};
44 44
45/* This basically defines the largest size an
46 * archetype may be - it is used for allocation of
47 * some structures, as well as determining how far
48 * we should look for the heads of big images.
49 */
50#define MAX_HEAD_OFFSET 8
51
52#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 45#define MAX_CLIENT_X MAP_CLIENT_X
53#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 46#define MAX_CLIENT_Y MAP_CLIENT_Y
54 47
55struct Map 48struct Map
56{ 49{
57 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 50 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
58}; 51};
59 52
60/* True max is 16383 given current map compaction method */ 53/* True max is 16383 given current map compaction method */
61# define MAXANIMNUM 2000 54#define MAXANIMNUM 10000
62 55
63struct statsinfo 56struct statsinfo
64{ 57{
65 char *range, *title; 58 char *range, *title;
66}; 59};
… …
169INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player 162INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
170struct client : zero_initialised, attachable 163struct client : zero_initialised, attachable
171{ 164{
172 int ACC (RW, fd); 165 int ACC (RW, fd);
173 unsigned int inbuf_len; // number of bytes valid in inbuf 166 unsigned int inbuf_len; // number of bytes valid in inbuf
174 uint8 *faces_sent; // This is a bitmap on sent face status
175 statsinfo stats; 167 statsinfo stats;
176 int ACC (RO, active); 168 int ACC (RO, active);
177 169
178 client_container cc_inv, cc_other;
179 Buffer outputbuffer; 170 Buffer outputbuffer;
180 171
181 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 172 char *ACC (RW, host); /* Which host it is connected from (ip address) */
182 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ 173 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
183 174
… …
202 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 193 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */
203 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 194 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */
204 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 195 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
205 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 196 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
206 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 197 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
198 bool ACC (RW, force_face0); /* CF+ client workaround for buggy checksum calculation in gcfclient */
199 bool ACC (RW, force_bad_checksum); /* CF+ client workaround for buggy checksum calculation in gcfclient */
207 bool ACC (RW, darkness); /* True if client wants darkness information */ 200 bool ACC (RW, darkness); /* True if client wants darkness information */
208 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 201 bool ACC (RW, image2); /* Client wants image2/face2 commands */
209 bool ACC (RW, update_look); /* If true, we need to send the look window */ 202 bool ACC (RW, update_look); /* If true, we need to send the look window */
210 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 203 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
211 /* used to arrange text in books, scrolls, or scripted dialogs */ 204 /* used to arrange text in books, scrolls, or scripted dialogs */
… …
219 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 212 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
220 enum MapMode mapmode; /* Type of map commands the client wants. */ 213 enum MapMode mapmode; /* Type of map commands the client wants. */
221 uint16 ACC (RW, look_position); /* start of drawing of look window */ 214 uint16 ACC (RW, look_position); /* start of drawing of look window */
222 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 215 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
223 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 216 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
224 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
225 217
226 maptile *ACC (RW, current_map); // CF+ last/current player map 218 maptile *ACC (RW, current_map); // CF+ last/current player map
219 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 220 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
228 char ACC (RW, version)[64]; // CF+ client name/version 221 char ACC (RW, version)[64]; // CF+ client name/version
222 uint8 ACC (RW, faceset); // CF+ selected faceset
229 223
230 player_ptr ACC (RO, pl); 224 player_ptr ACC (RO, pl);
231 225
232 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 226 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
233 227
234 void do_destroy (); 228 void do_destroy ();
235 void gather_callbacks (AV *&callbacks, event_type event) const; 229 void gather_callbacks (AV *&callbacks, event_type event) const;
236 230
231 iow socket_ev; void socket_cb (iow &w, int got);
237 iw cmd_ev; void cmd_cb (iw &w); 232 iw cmd_ev; void cmd_cb (iw &w);
238 iow socket_ev; void socket_cb (iow &w, int got); 233 client_container cc_inv, cc_other;
239 234
240 std::deque< command, slice_allocator<command> > cmd_queue; 235 std::deque< command, slice_allocator<command> > cmd_queue;
241 236
242 // large structures at the end please 237 // large structures at the end please
243 struct Map lastmap; 238 struct Map lastmap;
244 std::bitset<MAXANIMNUM> anims_sent; 239 std::bitset<MAXANIMNUM> anims_sent;
240 std::bitset<MAX_FACES> faces_sent;
241
245 // if we get an incomplete packet, this is used to hold the data. 242 // if we get an incomplete packet, this is used to hold the data.
246 // we add 2 byte for the header, one for the trailing 0 byte 243 // we add 2 byte for the header, one for the trailing 0 byte
247 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 244 uint8 inbuf[MAXSOCKBUF + 2 + 1];
248 245
249 bool may_execute (const packet_type *pkt) const; 246 bool may_execute (const packet_type *pkt) const;
… …
267 void send_packet (const char *buf); 264 void send_packet (const char *buf);
268 void send_packet (const char *buf, int len); 265 void send_packet (const char *buf, int len);
269 void send_packet_printf (const char *format, ...); 266 void send_packet_printf (const char *format, ...);
270 void send_packet (packet &sl); 267 void send_packet (packet &sl);
271 268
269 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
270 MTH void send_face (faceidx facenum, bool nocache = false);
271 MTH void send_faces (object *ob);
272 MTH void send_animation (short anim_num);
273
272 // called when something under the player changes 274 // called when something under the player changes
273 MTH void floorbox_update () { update_look = 1; } 275 MTH void floorbox_update () { update_look = 1; }
274 // called when the player has been moved 276 // called when the player has been moved
275 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 277 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
276 278
… …
283 285
284#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 286#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
285 ( ((__type)>0) &&\ 287 ( ((__type)>0) &&\
286 ((__sockPtr)->has_readable_type) && \ 288 ((__sockPtr)->has_readable_type) && \
287 ((__sockPtr)->supported_readables & (1<<(__type))) ) 289 ((__sockPtr)->supported_readables & (1<<(__type))) )
288
289/* Bitmask for the faces_sent[] array - what
290 * portion of the face have we sent?
291 */
292#define NS_FACESENT_FACE 0x1
293#define NS_FACESENT_SMOOTH 0x2
294 290
295/* Constants in the form EMI_ is for extended map infos. 291/* Constants in the form EMI_ is for extended map infos.
296 * Even if the client select the additionnal infos it wants 292 * Even if the client select the additionnal infos it wants
297 * on the map, there may exist cases where this whole info 293 * on the map, there may exist cases where this whole info
298 * is not given in one buch but in separate bunches. This 294 * is not given in one buch but in separate bunches. This
… …
320 316
321#define FACE_TYPES 1 317#define FACE_TYPES 1
322#define PNG_FACE_INDEX 0 318#define PNG_FACE_INDEX 0
323 319
324#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 320#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
325#define VERSION_SC 1027 321#define VERSION_SC 1026
322//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
326#define VERSION_INFO "Crossfire+ Server" 323#define VERSION_INFO "Crossfire+ Server"
327 324
328typedef object_vector<client, &client::active> sockvec; 325typedef object_vector<client, &client::active> sockvec;
329 326
330extern sockvec clients; 327extern sockvec clients;
331 328
332#define for_all_clients(var) \ 329#define for_all_clients(var) \
333 for (int _i = 0; _i < clients.size (); ++_i) \ 330 for (int _i = 0; _i < clients.size (); ++_i) \
334 declvar (client *, var, clients [_i]) 331 declvar (client *, var, clients [_i])
335 332
336extern int nrofpixmaps; //TODO: hrmpf, should go
337
338#endif 333#endif
339 334

Diff Legend

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