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.24 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.34 by root, Mon Mar 12 23:45:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for the X Window System 2 * CrossFire, A Multiplayer game for the X Window System
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The author can be reached via e-mail to crossfire@schmorp.de 22 * The author can be reached via e-mail to crossfire@schmorp.de
23*/ 23 */
24 24
25#ifndef CLIENT_H 25#ifndef CLIENT_H
26#define CLIENT_H 26#define CLIENT_H
27 27
28#include <deque> 28#include <deque>
… …
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]; 40 uint16 smooth[MAP_LAYERS];
41 unsigned char stat_hp; // health of something in this space, or 0 41 unsigned char stat_hp; // health of something in this space, or 0
42 unsigned char flags; 42 unsigned char flags;
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};
… …
98 ST_GET_PARTY_PASSWORD, 91 ST_GET_PARTY_PASSWORD,
99}; 92};
100 93
101// a handler for a specific type of packet 94// a handler for a specific type of packet
102enum { 95enum {
103 PF_PLAYER = 0x01, // must have valid player / will by synchronised 96 PF_PLAYER = 0x01, // must have valid player / will by synchronised
104 PF_PLAYING = 0x02, // must be in playing state 97 PF_PLAYING = 0x02, // must be in playing state
98 PF_COMMAND0 = 0x04, // command starts at offset 0
99 PF_COMMAND6 = 0x08, // command starts at offset 6
105}; 100};
106 101
107struct packet_type 102struct packet_type
108{ 103{
109 const char *name; 104 const char *name;
… …
167INTERFACE_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
168struct client : zero_initialised, attachable 163struct client : zero_initialised, attachable
169{ 164{
170 int ACC (RW, fd); 165 int ACC (RW, fd);
171 unsigned int inbuf_len; // number of bytes valid in inbuf 166 unsigned int inbuf_len; // number of bytes valid in inbuf
172 uint8 *faces_sent; // This is a bitmap on sent face status
173 statsinfo stats; 167 statsinfo stats;
174 int ACC (RO, active); 168 int ACC (RO, active);
175 169
176 client_container cc_inv, cc_other;
177 Buffer outputbuffer; 170 Buffer outputbuffer;
178 171
179 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) */
180 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 */
181 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 174
175 sint8 ACC (RW, last_level); /* Last level we sent to client */
176 uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */
177 float ACC (RW, last_weapon_sp); /* if diff than weapon_sp, update client */
178 sint32 ACC (RW, last_weight); /* Last weight as sent to client; -1 means do not send weight */
179 sint32 ACC (RW, last_weight_limit); /* Last weight limit transmitted to client */
180 uint32 ACC (RW, last_path_attuned); /* Last spell attunment sent to client */
181 uint32 ACC (RW, last_path_repelled); /* Last spell repelled sent to client */
182 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */
183 living ACC (RO, last_stats); /* Last stats as sent to client */
184 float ACC (RW, last_speed); /* Last speed as sent to client */
185 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
186 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
182 187
183 bool ACC (RW, afk); /* player is afk */ 188 bool ACC (RW, afk); /* player is afk */
184 bool ACC (RW, facecache); /* If true, client is caching images */ 189 bool ACC (RW, facecache); /* If true, client is caching images */
185 bool ACC (RW, sent_scroll); 190 bool ACC (RW, sent_scroll);
186 bool ACC (RW, sound); /* does the client want sound */ 191 bool ACC (RW, sound); /* does the client want sound */
… …
188 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 */
189 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 */
190 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 195 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */
191 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 196 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
192 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 */
193 bool ACC (RW, darkness); /* True if client wants darkness information */ 200 bool ACC (RW, darkness); /* True if client wants darkness information */
194 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 201 bool ACC (RW, image2); /* Client wants image2/face2 commands */
195 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 */
196 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 */
197 /* used to arrange text in books, scrolls, or scripted dialogs */ 204 /* used to arrange text in books, scrolls, or scripted dialogs */
… …
205 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 */
206 enum MapMode mapmode; /* Type of map commands the client wants. */ 213 enum MapMode mapmode; /* Type of map commands the client wants. */
207 uint16 ACC (RW, look_position); /* start of drawing of look window */ 214 uint16 ACC (RW, look_position); /* start of drawing of look window */
208 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 */
209 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 */
210 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
211 217
212 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
213 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
214 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
215 223
216 player_ptr ACC (RO, pl); 224 player_ptr ACC (RO, pl);
217 225
218 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 */
219 227
220 void do_destroy (); 228 void do_destroy ();
221 void gather_callbacks (AV *&callbacks, event_type event) const; 229 void gather_callbacks (AV *&callbacks, event_type event) const;
222 230
231 iow socket_ev; void socket_cb (iow &w, int got);
223 iw cmd_ev; void cmd_cb (iw &w); 232 iw cmd_ev; void cmd_cb (iw &w);
224 iow socket_ev; void socket_cb (iow &w, int got); 233 client_container cc_inv, cc_other;
225 234
226 std::deque< command, slice_allocator<command> > cmd_queue; 235 std::deque< command, slice_allocator<command> > cmd_queue;
227 236
228 // large structures at the end please 237 // large structures at the end please
229 struct Map lastmap; 238 struct Map lastmap;
230 std::bitset<MAXANIMNUM> anims_sent; 239 std::bitset<MAXANIMNUM> anims_sent;
240 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status
231 // if we get an incomplete packet, this is used to hold the data. 241 // if we get an incomplete packet, this is used to hold the data.
232 // we add 2 byte for the header, one for the trailing 0 byte 242 // we add 2 byte for the header, one for the trailing 0 byte
233 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 243 uint8 inbuf[MAXSOCKBUF + 2 + 1];
234 244
235 bool may_execute (const packet_type *pkt) const; 245 bool may_execute (const packet_type *pkt) const;
… …
237 247
238 void queue_command (packet_type *handler, char *data, int datalen); 248 void queue_command (packet_type *handler, char *data, int datalen);
239 MTH bool handle_command (); 249 MTH bool handle_command ();
240 // resets movement state 250 // resets movement state
241 MTH void reset_state (); 251 MTH void reset_state ();
252 // resets variable data used to send stat diffs
253 MTH void reset_stats ();
242 254
243 MTH bool handle_packet (); 255 MTH bool handle_packet ();
244 int next_packet (); // returns length of packet or 0 256 int next_packet (); // returns length of packet or 0
245 void skip_packet (int len); // we have processed the packet, skip it 257 void skip_packet (int len); // we have processed the packet, skip it
246 258
… …
304 316
305#define FACE_TYPES 1 317#define FACE_TYPES 1
306#define PNG_FACE_INDEX 0 318#define PNG_FACE_INDEX 0
307 319
308#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 320#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
309#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
310#define VERSION_INFO "Crossfire+ Server" 323#define VERSION_INFO "Crossfire+ Server"
311 324
312typedef object_vector<client, &client::active> sockvec; 325typedef object_vector<client, &client::active> sockvec;
313 326
314extern sockvec clients; 327extern sockvec clients;
315 328
316#define for_all_clients(var) \ 329#define for_all_clients(var) \
317 for (int _i = 0; _i < clients.size (); ++_i) \ 330 for (int _i = 0; _i < clients.size (); ++_i) \
318 declvar (client *, var, clients [_i]) 331 declvar (client *, var, clients [_i])
319 332
320extern int nrofpixmaps; //TODO: hrmpf, should go
321
322#endif 333#endif
323 334

Diff Legend

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