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.32 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.82 by root, Tue Dec 23 22:03:06 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,2008 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 uint16 smooth[MAP_LAYERS];
41 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
42 unsigned char flags; 77 unsigned char flags;
78 uint8_t smooth[MAP_LAYERS];
43}; 79};
44 80
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) 81#define MAX_CLIENT_X MAP_CLIENT_X
53#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 82#define MAX_CLIENT_Y MAP_CLIENT_Y
54 83
55struct Map 84struct Map
56{ 85{
57 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 86 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
58}; 87};
59 88
60/* True max is 16383 given current map compaction method */ 89/* True max is 16383 given current map compaction method */
61# define MAXANIMNUM 2000 90#define MAXANIMNUM 10000
62 91
63struct statsinfo 92struct statsinfo
64{ 93{
65 char *range, *title; 94 char *range, *title;
66}; 95};
… …
73 102
74/* 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
75 * instead of having a bunch of different fields that needed to 104 * instead of having a bunch of different fields that needed to
76 * get toggled. 105 * get toggled.
77 */ 106 */
78enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 107enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
79
80/* The following is the setup for a ring buffer for storing output
81 * data that the OS can't handle right away.
82 */
83struct Buffer
84{
85 char data[SOCKETBUFSIZE];
86 int start;
87 int len;
88};
89 108
90// states the socket can be in 109// states the socket can be in
91enum { 110enum {
92 ST_DEAD, // socket is dead 111 ST_DEAD, // socket is dead
93 ST_SETUP, // initial handshake / setup / login 112 ST_SETUP, // initial handshake / setup / login
94 ST_PLAYING, // logged in an playing 113 ST_PLAYING, // logged in an playing
95 ST_CUSTOM, // waiting for custom reply 114 ST_CUSTOM, // waiting for custom reply
96 115
97 ST_CHANGE_CLASS,
98 ST_GET_PARTY_PASSWORD, 116 ST_GET_PARTY_PASSWORD,
99}; 117};
100 118
101// a handler for a specific type of packet 119// a handler for a specific type of packet
102enum { 120enum {
… …
104 PF_PLAYING = 0x02, // must be in playing state 122 PF_PLAYING = 0x02, // must be in playing state
105 PF_COMMAND0 = 0x04, // command starts at offset 0 123 PF_COMMAND0 = 0x04, // command starts at offset 0
106 PF_COMMAND6 = 0x08, // command starts at offset 6 124 PF_COMMAND6 = 0x08, // command starts at offset 6
107}; 125};
108 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
109struct packet_type 136struct packet_type
110{ 137{
111 const char *name; 138 const char *name;
112 void *cb; 139 void *cb;
113 int flags; 140 int flags;
… …
117{ 144{
118 tstamp stamp; 145 tstamp stamp;
119 const packet_type *handler; 146 const packet_type *handler;
120 char *data; 147 char *data;
121 int datalen; 148 int datalen;
122
123 ~command ()
124 {
125 sfree<char> (data, datalen + 1);
126 }
127};
128
129struct refitem
130{
131 object_ptr op;
132};
133
134// this represents a container on the client side.
135// right now, there are only ever two of them:
136// the inventory and the floor/open container
137//TODO: unused as of yet
138struct client_container : vector< refitem, slice_allocator<refitem> >
139{
140 client *ns;
141 enum { CC_NONE, CC_INVENTORY, CC_MAPSPACE, CC_CONTAINER } type;
142
143 bool item_changed; // one of the items in here possibly changed
144
145 // for mapspace and container
146 int x, y;
147 maptile *map;
148
149 // for container
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);
164}; 149};
165 150
166/* 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. */
167#define MAX_PASSWORD_FAILURES 5 152#define MAX_PASSWORD_FAILURES 5
168 153
… …
170struct client : zero_initialised, attachable 155struct client : zero_initialised, attachable
171{ 156{
172 int ACC (RW, fd); 157 int ACC (RW, fd);
173 unsigned int inbuf_len; // number of bytes valid in inbuf 158 unsigned int inbuf_len; // number of bytes valid in inbuf
174 statsinfo stats; 159 statsinfo stats;
175 int ACC (RO, active); 160 object_vector_index ACC (RO, active);
176 161 player_ptr ACC (RO, pl);
177 Buffer outputbuffer;
178 162
179 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 163 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 */ 164 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
181 165
182 sint8 ACC (RW, last_level); /* Last level we sent to client */ 166 sint8 ACC (RW, last_level); /* Last level we sent to client */
… …
190 living ACC (RO, last_stats); /* Last stats as sent to client */ 174 living ACC (RO, last_stats); /* Last stats as sent to client */
191 float ACC (RW, last_speed); /* Last speed as sent to client */ 175 float ACC (RW, last_speed); /* Last speed as sent to client */
192 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */ 176 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 */ 177 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
194 178
179 bool ACC (RW, force_face0); // client workaround for buggy checksum calculation in gcfclient
180 bool ACC (RW, force_bad_checksum); // client workaround for buggy checksum calculation in gcfclient
181 bool ACC (RW, force_image_newmap); // client workaround for client not redrawing map on image upload
182 bool ACC (RW, enable_bg_scrub); // client workaround, gcfclient becomes unusable if you send it images
183
195 bool ACC (RW, afk); /* player is afk */ 184 bool ACC (RW, afk); /* player is afk */
196 bool ACC (RW, facecache); /* If true, client is caching images */ 185 bool ACC (RW, facecache); /* If true, client is caching images */
197 bool ACC (RW, sent_scroll); 186 bool ACC (RW, sent_scroll);
198 bool ACC (RW, sound); /* does the client want sound */ 187 bool ACC (RW, sound); /* does the client want sound */
199 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 188 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
200 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 189 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
201 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 190 bool ACC (RW, mapinfocmd); // return map info and send map change info
202 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 191 uint8_t ACC (RW, extcmd); // call into extensions/plugins
203 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */ 192 bool ACC (RW, extmap); // extend map comamnd with extra data
204 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */ 193 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
205 bool ACC (RW, darkness); /* True if client wants darkness information */ 194 bool ACC (RW, darkness); /* True if client wants darkness information */
206 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 195 bool ACC (RW, image2); /* Client wants image2/face2 commands */
196 uint8_t ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
207 bool ACC (RW, update_look); /* If true, we need to send the look window */ 197 bool ACC (RW, update_look); /* If true, we need to send the look window */
208 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 198 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
209 /* used to arrange text in books, scrolls, or scripted dialogs */ 199 /* used to arrange text in books, scrolls, or scripted dialogs */
210 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 200 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
211 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */ 201 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
212 /* Below are flags for extedend infos to pass to client 202 /* Below are flags for extedend infos to pass to client
213 * with S->C mapextended command */ 203 * with S->C mapextended command */
214 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 204 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
205 bool ACC (RW, smoothing); // trt-style smoothing
206 bool ACC (RW, can_msg); // trt-style text messages
215 207
208 bool ACC (RW, force_newmap); // force a newmap before next map update
216 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 209 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
217 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 210 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
218 enum MapMode mapmode; /* Type of map commands the client wants. */
219 uint16 ACC (RW, look_position); /* start of drawing of look window */ 211 uint16 ACC (RW, look_position); /* start of drawing of look window */
212 uint16 ACC (RW, mss); // likely tcp maximum segment size
213 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
220 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 214 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
221 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 215 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
222 216
223 maptile *ACC (RW, current_map); // CF+ last/current player map 217 maptile_ptr ACC (RW, current_map); // CF+ last/current player map
224 region *ACC (RW, current_region); // CF+ last/current player region 218 region_ptr ACC (RW, current_region); // CF+ last/current player region
225 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 219 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
226 char ACC (RW, version)[64]; // CF+ client name/version 220 shstr ACC (RW, version); // CF+ client name/version
227 uint8 ACC (RW, faceset); // CF+ selected faceset 221 uint8 ACC (RW, faceset); // CF+ selected faceset
228 222
229 player_ptr ACC (RO, pl); 223 tstamp ACC (RW, last_send); // last data send on socket.
230 224
231 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 225 int ACC (RW, rate_avail); // current rate balance
226 int ACC (RW, max_rate); // max. # of bytes to send per tick
227 faceidx ACC (RW, scrub_idx); // which face to send next
228 int ACC (RW, bg_scrub); // how many ticks till the next background face send
229
230 struct tcp_info tcpi;
231 tstamp next_rate_adjust;
232
233 unordered_vector<char *> mapinfo_queue;
234 void mapinfo_queue_clear ();
235 void mapinfo_queue_run ();
236 bool mapinfo_try (char *buf);
237
238 struct ixsend {
239 int16_t pri; // unused
240 faceidx idx;
241 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
242 };
243 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
244
245 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
246 MTH void flush_fx (); // send fx if required
232 247
233 void do_destroy (); 248 void do_destroy ();
234 void gather_callbacks (AV *&callbacks, event_type event) const; 249 void gather_callbacks (AV *&callbacks, event_type event) const;
235 250
236 iow socket_ev; void socket_cb (iow &w, int got); 251 iow socket_ev; void socket_cb (iow &w, int revents);
237 iw cmd_ev; void cmd_cb (iw &w);
238 client_container cc_inv, cc_other;
239 252
240 std::deque< command, slice_allocator<command> > cmd_queue; 253 std::deque< command, slice_allocator<command> > cmd_queue;
241 254
242 // large structures at the end please 255 // large structures at the end please
243 struct Map lastmap; 256 struct Map lastmap;
244 std::bitset<MAXANIMNUM> anims_sent; 257 std::bitset<MAXANIMNUM> anims_sent;
245 uint8 ACC (RW, faces_sent[MAX_FACES]); // This is a bitmap on sent face status 258 std::bitset<MAX_FACES> faces_sent;
259 std::bitset<FT_NUM> fx_want;
260
246 // if we get an incomplete packet, this is used to hold the data. 261 // if we get an incomplete packet, this is used to hold the data.
247 // we add 2 byte for the header, one for the trailing 0 byte 262 // we add 2 byte for the header, one for the trailing 0 byte
248 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 263 uint8 inbuf[MAXSOCKBUF + 2 + 1];
264
265 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
266 struct msg_buf
267 {
268 tick_t expire;
269 int len;
270 int count;
271 char msg[MSG_BUF_SIZE];
272 } msgbuf[MSG_BUF_COUNT];
273
274 MTH bool msg_suppressed (const char *msg);
275
276 /* The following is the setup for a ring buffer for storing output
277 * data that the OS can't handle right away.
278 * TODO: this member is enourmously large - optimise?
279 */
280 struct
281 {
282 char data[SOCKETBUFSIZE];
283 int start;
284 int len;
285 } outputbuffer;
249 286
250 bool may_execute (const packet_type *pkt) const; 287 bool may_execute (const packet_type *pkt) const;
251 void execute (const packet_type *pkt, char *data, int datalen); 288 void execute (const packet_type *pkt, char *data, int datalen);
252 289
253 void queue_command (packet_type *handler, char *data, int datalen); 290 void queue_command (packet_type *handler, char *data, int datalen);
… …
261 int next_packet (); // returns length of packet or 0 298 int next_packet (); // returns length of packet or 0
262 void skip_packet (int len); // we have processed the packet, skip it 299 void skip_packet (int len); // we have processed the packet, skip it
263 300
264 MTH void flush (); 301 MTH void flush ();
265 MTH void write_outputbuffer (); 302 MTH void write_outputbuffer ();
303 MTH int outputbuffer_len () const { return outputbuffer.len; }
266 void send (void *buf_, int len); 304 void send (void *buf_, int len);
267 305
268 void send_packet (const char *buf); 306 void send_packet (const char *buf);
269 void send_packet (const char *buf, int len); 307 void send_packet (const char *buf, int len);
270 void send_packet_printf (const char *format, ...); 308 void send_packet_printf (const char *format, ...);
271 void send_packet (packet &sl); 309 void send_packet (packet &sl);
272 310
311 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
312
313 MTH void send_face (faceidx facenum, int pri = 0);
314 MTH void send_image (faceidx facenum);
315 MTH void send_faces (object *ob);
316 MTH void send_animation (short anim_num);
317 void send_msg (int color, const char *type, const char *msg);
318
319 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
273 // called when something under the player changes 320 // called when something under the player changes
274 MTH void floorbox_update () { update_look = 1; } 321 MTH void floorbox_update () { update_look = 1; }
275 // called when the player has been moved 322 // called when the player has been moved
276 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 323 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
277 324
325 MTH void tick (); // called every server tick to do housekeeping etc.
326
278 MTH static client *create (int fd, const char *peername); 327 MTH static client *create (int fd, const char *peername);
328 MTH static void clock ();
329 MTH static void flush_sockets ();
279 330
280protected: 331protected:
281 client (int fd, const char *from_ip); 332 client (int fd, const char *from_ip);
282 ~client (); 333 ~client ();
283}; 334};
335
336#if FOR_PERL
337 ACC (RW, tcpi.tcpi_state);
338 ACC (RW, tcpi.tcpi_ca_state);
339 ACC (RW, tcpi.tcpi_retransmits);
340 ACC (RW, tcpi.tcpi_probes);
341 ACC (RW, tcpi.tcpi_backoff);
342 ACC (RW, tcpi.tcpi_options);
343 ACC (RO, tcpi.tcpi_snd_wscale);
344 ACC (RO, tcpi.tcpi_rcv_wscale);
345 ACC (RW, tcpi.tcpi_rto);
346 ACC (RW, tcpi.tcpi_ato);
347 ACC (RW, tcpi.tcpi_snd_mss);
348 ACC (RW, tcpi.tcpi_rcv_mss);
349 ACC (RW, tcpi.tcpi_unacked);
350 ACC (RW, tcpi.tcpi_sacked);
351 ACC (RW, tcpi.tcpi_lost);
352 ACC (RW, tcpi.tcpi_retrans);
353 ACC (RW, tcpi.tcpi_fackets);
354 ACC (RW, tcpi.tcpi_last_data_sent);
355 ACC (RW, tcpi.tcpi_last_ack_sent);
356 ACC (RW, tcpi.tcpi_last_data_recv);
357 ACC (RW, tcpi.tcpi_last_ack_recv);
358 ACC (RW, tcpi.tcpi_pmtu);
359 ACC (RW, tcpi.tcpi_rcv_ssthresh);
360 ACC (RW, tcpi.tcpi_rtt);
361 ACC (RW, tcpi.tcpi_rttvar);
362 ACC (RW, tcpi.tcpi_snd_ssthresh);
363 ACC (RW, tcpi.tcpi_snd_cwnd);
364 ACC (RW, tcpi.tcpi_advmss);
365 ACC (RW, tcpi.tcpi_reordering);
366#endif
284 367
285#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 368#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
286 ( ((__type)>0) &&\ 369 ( ((__type)>0) &&\
287 ((__sockPtr)->has_readable_type) && \ 370 ((__sockPtr)->has_readable_type) && \
288 ((__sockPtr)->supported_readables & (1<<(__type))) ) 371 ((__sockPtr)->supported_readables & (1<<(__type))) )
289
290/* Bitmask for the faces_sent[] array - what
291 * portion of the face have we sent?
292 */
293#define NS_FACESENT_FACE 0x1
294#define NS_FACESENT_SMOOTH 0x2
295 372
296/* Constants in the form EMI_ is for extended map infos. 373/* Constants in the form EMI_ is for extended map infos.
297 * Even if the client select the additionnal infos it wants 374 * Even if the client select the additionnal infos it wants
298 * on the map, there may exist cases where this whole info 375 * on the map, there may exist cases where this whole info
299 * is not given in one buch but in separate bunches. This 376 * is not given in one buch but in separate bunches. This
… …
323#define PNG_FACE_INDEX 0 400#define PNG_FACE_INDEX 0
324 401
325#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 402#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
326#define VERSION_SC 1026 403#define VERSION_SC 1026
327//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible 404//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
328#define VERSION_INFO "Crossfire+ Server" 405#define VERSION_INFO "Deliantra Server"
329 406
330typedef object_vector<client, &client::active> sockvec; 407typedef object_vector<client, &client::active> sockvec;
331 408
332extern sockvec clients; 409extern sockvec clients;
333 410
334#define for_all_clients(var) \ 411#define for_all_clients(var) \
335 for (int _i = 0; _i < clients.size (); ++_i) \ 412 for (int _i = 0; _i < clients.size (); ++_i) \
336 declvar (client *, var, clients [_i]) 413 statementvar (client *, var, clients [_i])
414
415// returns true when the message needs special (read: perl) treatment
416static inline bool
417msg_is_special (const char *msg, bool nl_special = true)
418{
419 return msg [strcspn (msg, nl_special ? "<&\n" : "<&")];
420}
337 421
338#endif 422#endif
339 423

Diff Legend

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