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.23 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.32 by root, Sun Mar 11 02:12:44 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
… …
92 ST_DEAD, // socket is dead 92 ST_DEAD, // socket is dead
93 ST_SETUP, // initial handshake / setup / login 93 ST_SETUP, // initial handshake / setup / login
94 ST_PLAYING, // logged in an playing 94 ST_PLAYING, // logged in an playing
95 ST_CUSTOM, // waiting for custom reply 95 ST_CUSTOM, // waiting for custom reply
96 96
97 ST_CONFIRM_QUIT,
98 ST_CHANGE_CLASS, 97 ST_CHANGE_CLASS,
99 ST_GET_PARTY_PASSWORD, 98 ST_GET_PARTY_PASSWORD,
100}; 99};
101 100
102// a handler for a specific type of packet 101// a handler for a specific type of packet
103enum { 102enum {
104 PF_PLAYER = 0x01, // must have valid player / will by synchronised 103 PF_PLAYER = 0x01, // must have valid player / will by synchronised
105 PF_PLAYING = 0x02, // must be in playing state 104 PF_PLAYING = 0x02, // must be in playing state
105 PF_COMMAND0 = 0x04, // command starts at offset 0
106 PF_COMMAND6 = 0x08, // command starts at offset 6
106}; 107};
107 108
108struct packet_type 109struct packet_type
109{ 110{
110 const char *name; 111 const char *name;
… …
168INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player 169INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
169struct client : zero_initialised, attachable 170struct client : zero_initialised, attachable
170{ 171{
171 int ACC (RW, fd); 172 int ACC (RW, fd);
172 unsigned int inbuf_len; // number of bytes valid in inbuf 173 unsigned int inbuf_len; // number of bytes valid in inbuf
173 uint8 *faces_sent; // This is a bitmap on sent face status
174 statsinfo stats; 174 statsinfo stats;
175 int ACC (RO, active);
175 176
176 client_container cc_inv, cc_other;
177 Buffer outputbuffer; 177 Buffer outputbuffer;
178 178
179 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 179 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 */ 180 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 */ 181
182 sint8 ACC (RW, last_level); /* Last level we sent to client */
183 uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */
184 float ACC (RW, last_weapon_sp); /* if diff than weapon_sp, update client */
185 sint32 ACC (RW, last_weight); /* Last weight as sent to client; -1 means do not send weight */
186 sint32 ACC (RW, last_weight_limit); /* Last weight limit transmitted to client */
187 uint32 ACC (RW, last_path_attuned); /* Last spell attunment sent to client */
188 uint32 ACC (RW, last_path_repelled); /* Last spell repelled sent to client */
189 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */
190 living ACC (RO, last_stats); /* Last stats as sent to client */
191 float ACC (RW, last_speed); /* Last speed as sent to client */
192 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
193 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
182 194
183 bool ACC (RW, afk); /* player is afk */ 195 bool ACC (RW, afk); /* player is afk */
184 bool ACC (RW, facecache); /* If true, client is caching images */ 196 bool ACC (RW, facecache); /* If true, client is caching images */
185 bool ACC (RW, sent_scroll); 197 bool ACC (RW, sent_scroll);
186 bool ACC (RW, sound); /* does the client want sound */ 198 bool ACC (RW, sound); /* does the client want sound */
… …
205 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 217 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
206 enum MapMode mapmode; /* Type of map commands the client wants. */ 218 enum MapMode mapmode; /* Type of map commands the client wants. */
207 uint16 ACC (RW, look_position); /* start of drawing of look window */ 219 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 */ 220 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 */ 221 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 222
212 maptile *ACC (RW, current_map); // CF+ last/current player map 223 maptile *ACC (RW, current_map); // CF+ last/current player map
224 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 225 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
214 char ACC (RW, version)[64]; // CF+ client name/version 226 char ACC (RW, version)[64]; // CF+ client name/version
227 uint8 ACC (RW, faceset); // CF+ selected faceset
215 228
216 player_ptr ACC (RO, pl); 229 player_ptr ACC (RO, pl);
217 230
218 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 231 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
219 232
220 void do_destroy (); 233 void do_destroy ();
221 void gather_callbacks (AV *&callbacks, event_type event) const; 234 void gather_callbacks (AV *&callbacks, event_type event) const;
222 235
236 iow socket_ev; void socket_cb (iow &w, int got);
223 iw cmd_ev; void cmd_cb (iw &w); 237 iw cmd_ev; void cmd_cb (iw &w);
224 iow socket_ev; void socket_cb (iow &w, int got); 238 client_container cc_inv, cc_other;
225 239
226 std::deque< command, slice_allocator<command> > cmd_queue; 240 std::deque< command, slice_allocator<command> > cmd_queue;
227 241
228 // large structures at the end please 242 // large structures at the end please
229 struct Map lastmap; 243 struct Map lastmap;
230 std::bitset<MAXANIMNUM> anims_sent; 244 std::bitset<MAXANIMNUM> anims_sent;
245 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. 246 // 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 247 // we add 2 byte for the header, one for the trailing 0 byte
233 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 248 uint8 inbuf[MAXSOCKBUF + 2 + 1];
234 249
235 bool may_execute (const packet_type *pkt) const; 250 bool may_execute (const packet_type *pkt) const;
… …
237 252
238 void queue_command (packet_type *handler, char *data, int datalen); 253 void queue_command (packet_type *handler, char *data, int datalen);
239 MTH bool handle_command (); 254 MTH bool handle_command ();
240 // resets movement state 255 // resets movement state
241 MTH void reset_state (); 256 MTH void reset_state ();
257 // resets variable data used to send stat diffs
258 MTH void reset_stats ();
242 259
243 MTH bool handle_packet (); 260 MTH bool handle_packet ();
244 int next_packet (); // returns length of packet or 0 261 int next_packet (); // returns length of packet or 0
245 void skip_packet (int len); // we have processed the packet, skip it 262 void skip_packet (int len); // we have processed the packet, skip it
246 263
… …
304 321
305#define FACE_TYPES 1 322#define FACE_TYPES 1
306#define PNG_FACE_INDEX 0 323#define PNG_FACE_INDEX 0
307 324
308#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 325#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
309#define VERSION_SC 1027 326#define VERSION_SC 1026
327//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
310#define VERSION_INFO "Crossfire+ Server" 328#define VERSION_INFO "Crossfire+ Server"
311 329
312typedef unordered_vector<client *> sockvec; 330typedef object_vector<client, &client::active> sockvec;
313 331
314extern sockvec clients; 332extern sockvec clients;
315extern int nrofpixmaps; //TODO: hrmpf, should go 333
334#define for_all_clients(var) \
335 for (int _i = 0; _i < clients.size (); ++_i) \
336 declvar (client *, var, clients [_i])
316 337
317#endif 338#endif
318 339

Diff Legend

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