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.38 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.75 by root, Tue Apr 22 07:01:46 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for the X Window System 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to crossfire@schmorp.de 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#ifndef CLIENT_H 24#ifndef CLIENT_H
26#define CLIENT_H 25#define CLIENT_H
27 26
28#include <deque> 27#include <deque>
29#include <bitset> 28#include <bitset>
30#include <tr1/unordered_set> 29#include <tr1/unordered_set>
31 30
31#if HAVE_TCP_INFO
32# include <netinet/tcp.h>
33#else
34 struct tcp_info {
35 // dummy
36 int tcpi_state;
37 int tcpi_ca_state;
38 int tcpi_retransmits;
39 int tcpi_probes;
40 int tcpi_backoff;
41 int tcpi_options;
42 int tcpi_snd_wscale;
43 int tcpi_rcv_wscale;
44 int tcpi_rto;
45 int tcpi_ato;
46 int tcpi_snd_mss;
47 int tcpi_rcv_mss;
48 int tcpi_unacked;
49 int tcpi_sacked;
50 int tcpi_lost;
51 int tcpi_retrans;
52 int tcpi_fackets;
53 int tcpi_last_data_sent;
54 int tcpi_last_ack_sent;
55 int tcpi_last_data_recv;
56 int tcpi_last_ack_recv;
57 int tcpi_pmtu;
58 int tcpi_rcv_ssthresh;
59 int tcpi_rtt;
60 int tcpi_rttvar;
61 int tcpi_snd_ssthresh;
62 int tcpi_snd_cwnd;
63 int tcpi_advmss;
64 int tcpi_reordering;
65 };
66#endif
67
32// (possibly) max. number of objects "per page" in the ground container 68// (possibly) max. number of objects "per page" in the ground container
33#define FLOORBOX_PAGESIZE 50 69#define FLOORBOX_PAGESIZE 50
34 70
35struct MapCell 71struct MapCell
36{ 72{
37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 73 tag_t player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
38 int count; /* This is really darkness in the map1 command */ 74 int count; /* This is really darkness in the map1 command */
39 faceidx faces[MAP_LAYERS]; 75 faceidx faces[MAP_LAYERS];
40 unsigned char stat_hp; // health of something in this space, or 0 76 unsigned char stat_hp; // health of something in this space, or 0
41 unsigned char flags; 77 unsigned char flags;
42 uint8_t smooth[MAP_LAYERS]; 78 uint8_t smooth[MAP_LAYERS];
… …
66 102
67/* Only one map mode can actually be used, so lets make it a switch 103/* Only one map mode can actually be used, so lets make it a switch
68 * instead of having a bunch of different fields that needed to 104 * instead of having a bunch of different fields that needed to
69 * get toggled. 105 * get toggled.
70 */ 106 */
71enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 107enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
72
73/* The following is the setup for a ring buffer for storing output
74 * data that the OS can't handle right away.
75 */
76struct Buffer
77{
78 char data[SOCKETBUFSIZE];
79 int start;
80 int len;
81};
82 108
83// states the socket can be in 109// states the socket can be in
84enum { 110enum {
85 ST_DEAD, // socket is dead 111 ST_DEAD, // socket is dead
86 ST_SETUP, // initial handshake / setup / login 112 ST_SETUP, // initial handshake / setup / login
87 ST_PLAYING, // logged in an playing 113 ST_PLAYING, // logged in an playing
88 ST_CUSTOM, // waiting for custom reply 114 ST_CUSTOM, // waiting for custom reply
89 115
90 ST_CHANGE_CLASS,
91 ST_GET_PARTY_PASSWORD, 116 ST_GET_PARTY_PASSWORD,
92}; 117};
93 118
94// a handler for a specific type of packet 119// a handler for a specific type of packet
95enum { 120enum {
… …
97 PF_PLAYING = 0x02, // must be in playing state 122 PF_PLAYING = 0x02, // must be in playing state
98 PF_COMMAND0 = 0x04, // command starts at offset 0 123 PF_COMMAND0 = 0x04, // command starts at offset 0
99 PF_COMMAND6 = 0x08, // command starts at offset 6 124 PF_COMMAND6 = 0x08, // command starts at offset 6
100}; 125};
101 126
127// face type.s bit 0 means "has meta info prepended"
128enum {
129 FT_FACE = 0 * 2 + 0, // faces (images)
130 FT_MUSIC = 1 * 2 + 1, // background music
131 FT_SOUND = 2 * 2 + 1, // effects
132 FT_RSRC = 3 * 2 + 0, // generic data files
133 FT_NUM,
134};
135
102struct packet_type 136struct packet_type
103{ 137{
104 const char *name; 138 const char *name;
105 void *cb; 139 void *cb;
106 int flags; 140 int flags;
… …
110{ 144{
111 tstamp stamp; 145 tstamp stamp;
112 const packet_type *handler; 146 const packet_type *handler;
113 char *data; 147 char *data;
114 int datalen; 148 int datalen;
115
116 ~command ()
117 {
118 sfree<char> (data, datalen + 1);
119 }
120};
121
122struct refitem
123{
124 object_ptr op;
125};
126
127// this represents a container on the client side.
128// right now, there are only ever two of them:
129// the inventory and the floor/open container
130//TODO: unused as of yet
131struct client_container : vector< refitem, slice_allocator<refitem> >
132{
133 client *ns;
134 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
135
136 bool item_changed; // one of the items in here possibly changed
137
138 // for mapspace and container
139 int x, y;
140 maptile *map;
141
142 // for container
143 object *env;
144
145 client_container (client *ns)
146 : ns (ns), type (CC_NONE) { }
147
148 tag_t tag () const;
149
150 inline iterator merge_item (iterator i, object *op);
151
152 void clear ();
153 void update ();
154
155 void set_mapspace (maptile *map, int x, int y);
156 void set_container (object *env);
157}; 149};
158 150
159/* how many times we are allowed to give the wrong password before being kicked. */ 151/* how many times we are allowed to give the wrong password before being kicked. */
160#define MAX_PASSWORD_FAILURES 5 152#define MAX_PASSWORD_FAILURES 5
161 153
… …
163struct client : zero_initialised, attachable 155struct client : zero_initialised, attachable
164{ 156{
165 int ACC (RW, fd); 157 int ACC (RW, fd);
166 unsigned int inbuf_len; // number of bytes valid in inbuf 158 unsigned int inbuf_len; // number of bytes valid in inbuf
167 statsinfo stats; 159 statsinfo stats;
168 int ACC (RO, active); 160 object_vector_index ACC (RO, active);
161 player_ptr ACC (RO, pl);
169 162
170 Buffer outputbuffer; 163 /* The following is the setup for a ring buffer for storing output
164 * data that the OS can't handle right away.
165 */
166 struct
167 {
168 char data[SOCKETBUFSIZE];
169 int start;
170 int len;
171 } outputbuffer;
171 172
172 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 173 char *ACC (RW, host); /* Which host it is connected from (ip address) */
173 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ 174 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
174 175
175 sint8 ACC (RW, last_level); /* Last level we sent to client */ 176 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 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 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); /* 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 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_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_repelled); /* Last spell repelled sent to client */
182 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */ 183 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 living ACC (RO, last_stats); /* Last stats as sent to client */
184 float ACC (RW, last_speed); /* Last speed as sent to client */ 185 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 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 */ 187 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
187 188
189 bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient
190 bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient
191 bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload
192 bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images
193
188 bool ACC (RW, afk); /* player is afk */ 194 bool ACC (RW, afk); /* player is afk */
189 bool ACC (RW, facecache); /* If true, client is caching images */ 195 bool ACC (RW, facecache); /* If true, client is caching images */
190 bool ACC (RW, sent_scroll); 196 bool ACC (RW, sent_scroll);
191 bool ACC (RW, sound); /* does the client want sound */ 197 bool ACC (RW, sound); /* does the client want sound */
192 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 198 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
193 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 199 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
194 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 200 bool ACC (RW, mapinfocmd); // return map info and send map change info
195 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 201 uint8_t ACC (RW, extcmd); // call into extensions/plugins
196 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 202 bool ACC (RW, extmap); // extend map comamnd with extra data
197 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 203 bool ACC (RW, buggy_mapscroll); // 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 */
200 bool ACC (RW, darkness); /* True if client wants darkness information */ 204 bool ACC (RW, darkness); /* True if client wants darkness information */
201 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 205 bool ACC (RW, image2); /* Client wants image2/face2 commands */
206 uint8_t ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
202 bool ACC (RW, update_look); /* If true, we need to send the look window */ 207 bool ACC (RW, update_look); /* If true, we need to send the look window */
203 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 208 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
204 /* used to arrange text in books, scrolls, or scripted dialogs */ 209 /* used to arrange text in books, scrolls, or scripted dialogs */
205 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 210 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
206 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */ 211 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
207 /* Below are flags for extedend infos to pass to client 212 /* Below are flags for extedend infos to pass to client
208 * with S->C mapextended command */ 213 * with S->C mapextended command */
209 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 214 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
215 bool ACC (RW, smoothing); // trt-style smoothing
216 bool ACC (RW, can_msg); // trt-style text messages
210 217
218 bool ACC (RW, force_newmap); // force a newmap before next map update
211 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 219 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
212 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 220 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
213 enum MapMode mapmode; /* Type of map commands the client wants. */
214 uint16 ACC (RW, look_position); /* start of drawing of look window */ 221 uint16 ACC (RW, look_position); /* start of drawing of look window */
222 uint16 ACC (RW, mss); // likely tcp maximum segment size
223 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
215 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 224 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
216 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 225 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
217 226
218 maptile *ACC (RW, current_map); // CF+ last/current player map 227 maptile *ACC (RW, current_map); // CF+ last/current player map
219 region *ACC (RW, current_region); // CF+ last/current player region 228 region *ACC (RW, current_region); // CF+ last/current player region
220 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 229 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
221 char ACC (RW, version)[64]; // CF+ client name/version 230 shstr ACC (RW, version); // CF+ client name/version
222 uint8 ACC (RW, faceset); // CF+ selected faceset 231 uint8 ACC (RW, faceset); // CF+ selected faceset
223 232
224 player_ptr ACC (RO, pl); 233 tstamp ACC (RW, last_send); // last data send on socket.
225 234
226 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 235 int ACC (RW, rate_avail); // current rate balance
227
228 int ACC (RW, max_rate); // max. # of bytes to send per tick 236 int ACC (RW, max_rate); // max. # of bytes to send per tick
229 std::vector<faceidx> askface; // which faces have been requested by the client 237 faceidx ACC (RW, scrub_idx); // which face to send next
238 int ACC (RW, bg_scrub); // how many ticks till the next background face send
239
240 struct tcp_info tcpi;
241 tstamp next_rate_adjust;
242
243 unordered_vector<char *> mapinfo_queue;
244 void mapinfo_queue_clear ();
245 void mapinfo_queue_run ();
246 bool mapinfo_try (char *buf);
247
248 struct ixsend {
249 int16_t pri; // unused
250 faceidx idx;
251 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
252 };
253 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
254
255 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
256 MTH void flush_fx (); // send fx if required
230 257
231 void do_destroy (); 258 void do_destroy ();
232 void gather_callbacks (AV *&callbacks, event_type event) const; 259 void gather_callbacks (AV *&callbacks, event_type event) const;
233 260
234 iow socket_ev; void socket_cb (iow &w, int got); 261 iow socket_ev; void socket_cb (iow &w, int revents);
235 iw cmd_ev; void cmd_cb (iw &w);
236 client_container cc_inv, cc_other;
237 262
238 std::deque< command, slice_allocator<command> > cmd_queue; 263 std::deque< command, slice_allocator<command> > cmd_queue;
239 264
240 // large structures at the end please 265 // large structures at the end please
241 struct Map lastmap; 266 struct Map lastmap;
242 std::bitset<MAXANIMNUM> anims_sent; 267 std::bitset<MAXANIMNUM> anims_sent;
243 std::bitset<MAX_FACES> faces_sent; 268 std::bitset<MAX_FACES> faces_sent;
269 std::bitset<FT_NUM> fx_want;
244 270
245 // if we get an incomplete packet, this is used to hold the data. 271 // 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 272 // we add 2 byte for the header, one for the trailing 0 byte
247 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 273 uint8 inbuf[MAXSOCKBUF + 2 + 1];
274
275 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
276 struct msg_buf
277 {
278 tick_t expire;
279 int len;
280 int count;
281 char msg[MSG_BUF_SIZE];
282 } msgbuf[MSG_BUF_COUNT];
283
284 MTH bool msg_suppressed (const char *msg);
248 285
249 bool may_execute (const packet_type *pkt) const; 286 bool may_execute (const packet_type *pkt) const;
250 void execute (const packet_type *pkt, char *data, int datalen); 287 void execute (const packet_type *pkt, char *data, int datalen);
251 288
252 void queue_command (packet_type *handler, char *data, int datalen); 289 void queue_command (packet_type *handler, char *data, int datalen);
… …
269 void send_packet (const char *buf, int len); 306 void send_packet (const char *buf, int len);
270 void send_packet_printf (const char *format, ...); 307 void send_packet_printf (const char *format, ...);
271 void send_packet (packet &sl); 308 void send_packet (packet &sl);
272 309
273 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 310 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
311
274 MTH void send_face (faceidx facenum); 312 MTH void send_face (faceidx facenum, int pri = 0);
275 MTH void send_image (faceidx facenum); 313 MTH void send_image (faceidx facenum);
276 MTH void send_faces (object *ob); 314 MTH void send_faces (object *ob);
277 MTH void send_animation (short anim_num); 315 MTH void send_animation (short anim_num);
316 void send_msg (int color, const char *type, const char *msg);
278 317
318 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
279 // called when something under the player changes 319 // called when something under the player changes
280 MTH void floorbox_update () { update_look = 1; } 320 MTH void floorbox_update () { update_look = 1; }
281 // called when the player has been moved 321 // called when the player has been moved
282 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 322 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
283 323
324 MTH void tick (); // called every server tick to do housekeeping etc.
325
284 MTH static client *create (int fd, const char *peername); 326 MTH static client *create (int fd, const char *peername);
327 MTH static void clock ();
328 MTH static void flush_sockets ();
285 329
286protected: 330protected:
287 client (int fd, const char *from_ip); 331 client (int fd, const char *from_ip);
288 ~client (); 332 ~client ();
289}; 333};
334
335#if FOR_PERL
336 ACC (RW, tcpi.tcpi_state);
337 ACC (RW, tcpi.tcpi_ca_state);
338 ACC (RW, tcpi.tcpi_retransmits);
339 ACC (RW, tcpi.tcpi_probes);
340 ACC (RW, tcpi.tcpi_backoff);
341 ACC (RW, tcpi.tcpi_options);
342 ACC (RO, tcpi.tcpi_snd_wscale);
343 ACC (RO, tcpi.tcpi_rcv_wscale);
344 ACC (RW, tcpi.tcpi_rto);
345 ACC (RW, tcpi.tcpi_ato);
346 ACC (RW, tcpi.tcpi_snd_mss);
347 ACC (RW, tcpi.tcpi_rcv_mss);
348 ACC (RW, tcpi.tcpi_unacked);
349 ACC (RW, tcpi.tcpi_sacked);
350 ACC (RW, tcpi.tcpi_lost);
351 ACC (RW, tcpi.tcpi_retrans);
352 ACC (RW, tcpi.tcpi_fackets);
353 ACC (RW, tcpi.tcpi_last_data_sent);
354 ACC (RW, tcpi.tcpi_last_ack_sent);
355 ACC (RW, tcpi.tcpi_last_data_recv);
356 ACC (RW, tcpi.tcpi_last_ack_recv);
357 ACC (RW, tcpi.tcpi_pmtu);
358 ACC (RW, tcpi.tcpi_rcv_ssthresh);
359 ACC (RW, tcpi.tcpi_rtt);
360 ACC (RW, tcpi.tcpi_rttvar);
361 ACC (RW, tcpi.tcpi_snd_ssthresh);
362 ACC (RW, tcpi.tcpi_snd_cwnd);
363 ACC (RW, tcpi.tcpi_advmss);
364 ACC (RW, tcpi.tcpi_reordering);
365#endif
290 366
291#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 367#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
292 ( ((__type)>0) &&\ 368 ( ((__type)>0) &&\
293 ((__sockPtr)->has_readable_type) && \ 369 ((__sockPtr)->has_readable_type) && \
294 ((__sockPtr)->supported_readables & (1<<(__type))) ) 370 ((__sockPtr)->supported_readables & (1<<(__type))) )
… …
323#define PNG_FACE_INDEX 0 399#define PNG_FACE_INDEX 0
324 400
325#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 401#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
326#define VERSION_SC 1026 402#define VERSION_SC 1026
327//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible 403//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
328#define VERSION_INFO "Crossfire+ Server" 404#define VERSION_INFO "Deliantra Server"
329 405
330typedef object_vector<client, &client::active> sockvec; 406typedef object_vector<client, &client::active> sockvec;
331 407
332extern sockvec clients; 408extern sockvec clients;
333 409
334#define for_all_clients(var) \ 410#define for_all_clients(var) \
335 for (int _i = 0; _i < clients.size (); ++_i) \ 411 for (int _i = 0; _i < clients.size (); ++_i) \
336 declvar (client *, var, clients [_i]) 412 statementvar (client *, var, clients [_i])
337 413
338#endif 414#endif
339 415

Diff Legend

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