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.81 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.86 by root, Wed Sep 2 16:54:20 2009 UTC

158 unsigned int inbuf_len; // number of bytes valid in inbuf 158 unsigned int inbuf_len; // number of bytes valid in inbuf
159 statsinfo stats; 159 statsinfo stats;
160 object_vector_index ACC (RO, active); 160 object_vector_index ACC (RO, active);
161 player_ptr ACC (RO, pl); 161 player_ptr ACC (RO, pl);
162 162
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;
172
173 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) */
174 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 */
175 165
176 sint8 ACC (RW, last_level); /* Last level we sent to client */ 166 sint8 ACC (RW, last_level); /* Last level we sent to client */
177 uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */ 167 uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */
184 living ACC (RO, last_stats); /* Last stats as sent to client */ 174 living ACC (RO, last_stats); /* Last stats as sent to client */
185 float ACC (RW, last_speed); /* Last speed as sent to client */ 175 float ACC (RW, last_speed); /* Last speed as sent to client */
186 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 */
187 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 */
188 178
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
194 bool ACC (RW, afk); /* player is afk */ 179 bool ACC (RW, afk); /* player is afk */
195 bool ACC (RW, facecache); /* If true, client is caching images */
196 bool ACC (RW, sent_scroll); 180 bool ACC (RW, sent_scroll);
197 bool ACC (RW, sound); /* does the client want sound */ 181 bool ACC (RW, sound); /* does the client want sound */
198 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 182 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
199 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */ 183 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
200 bool ACC (RW, mapinfocmd); // return map info and send map change info 184 bool ACC (RW, mapinfocmd); // return map info and send map change info
201 uint8_t ACC (RW, extcmd); // call into extensions/plugins 185 uint8_t ACC (RW, extcmd); // call into extensions/plugins
202 bool ACC (RW, extmap); // extend map comamnd with extra data
203 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
204 bool ACC (RW, darkness); /* True if client wants darkness information */
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
207 bool ACC (RW, update_look); /* If true, we need to send the look window */ 186 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 */ 187 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
209 /* used to arrange text in books, scrolls, or scripted dialogs */ 188 /* 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 */ 189 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 */
212 /* Below are flags for extedend infos to pass to client
213 * with S->C mapextended command */
214 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
215 bool ACC (RW, smoothing); // trt-style smoothing 190 bool ACC (RW, smoothing); // deliantra-style smoothing
216 bool ACC (RW, can_msg); // trt-style text messages
217 191
218 bool ACC (RW, force_newmap); // force a newmap before next map update 192 bool ACC (RW, force_newmap); // force a newmap before next map update
219 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 193 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
220 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 194 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
221 uint16 ACC (RW, look_position); /* start of drawing of look window */ 195 uint16 ACC (RW, look_position); /* start of drawing of look window */
230 shstr ACC (RW, version); // CF+ client name/version 204 shstr ACC (RW, version); // CF+ client name/version
231 uint8 ACC (RW, faceset); // CF+ selected faceset 205 uint8 ACC (RW, faceset); // CF+ selected faceset
232 206
233 tstamp ACC (RW, last_send); // last data send on socket. 207 tstamp ACC (RW, last_send); // last data send on socket.
234 208
209 float ACC (RW, socket_timeout); /* after how many seconds of no ack do we declare dead */
235 int ACC (RW, rate_avail); // current rate balance 210 int ACC (RW, rate_avail); // current rate balance
236 int ACC (RW, max_rate); // max. # of bytes to send per tick 211 int ACC (RW, max_rate); // max. # of bytes to send per tick
237 faceidx ACC (RW, scrub_idx); // which face to send next 212 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 213 int ACC (RW, bg_scrub); // how many ticks till the next background face send
239 214
281 char msg[MSG_BUF_SIZE]; 256 char msg[MSG_BUF_SIZE];
282 } msgbuf[MSG_BUF_COUNT]; 257 } msgbuf[MSG_BUF_COUNT];
283 258
284 MTH bool msg_suppressed (const char *msg); 259 MTH bool msg_suppressed (const char *msg);
285 260
261 /* The following is the setup for a ring buffer for storing output
262 * data that the OS can't handle right away.
263 * TODO: this member is enourmously large - optimise?
264 */
265 struct
266 {
267 char data[SOCKETBUFSIZE];
268 int start;
269 int len;
270 } outputbuffer;
271
286 bool may_execute (const packet_type *pkt) const; 272 bool may_execute (const packet_type *pkt) const;
287 void execute (const packet_type *pkt, char *data, int datalen); 273 void execute (const packet_type *pkt, char *data, int datalen);
288 274
289 void queue_command (packet_type *handler, char *data, int datalen); 275 void queue_command (packet_type *handler, char *data, int datalen);
290 MTH bool handle_command (); 276 MTH bool handle_command ();
308 void send_packet (packet &sl); 294 void send_packet (packet &sl);
309 295
310 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 296 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
311 297
312 MTH void send_face (faceidx facenum, int pri = 0); 298 MTH void send_face (faceidx facenum, int pri = 0);
313 MTH void send_image (faceidx facenum);
314 MTH void send_faces (object *ob); 299 MTH void send_faces (object *ob);
315 MTH void send_animation (short anim_num); 300 MTH void send_animation (short anim_num);
316 void send_msg (int color, const char *type, const char *msg); 301 void send_msg (int color, const char *type, const char *msg);
317 302
318 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0); 303 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
367#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 352#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
368 ( ((__type)>0) &&\ 353 ( ((__type)>0) &&\
369 ((__sockPtr)->has_readable_type) && \ 354 ((__sockPtr)->has_readable_type) && \
370 ((__sockPtr)->supported_readables & (1<<(__type))) ) 355 ((__sockPtr)->supported_readables & (1<<(__type))) )
371 356
372/* Constants in the form EMI_ is for extended map infos.
373 * Even if the client select the additionnal infos it wants
374 * on the map, there may exist cases where this whole info
375 * is not given in one buch but in separate bunches. This
376 * is done performance reasons (imagine some info related to
377 * a visible object and another info related to a 4 square
378 * width and height area). At the begin of an extended info packet
379 * is a bit field. A bit is activated for each extended info
380 * present in the data
381 */
382
383/* Meanings:
384 * EMI_NOREDRAW Take extended infos into account but don't redraw,
385 * some additionnal datas will follow in a new packet
386 * EMI_SMOOTH Datas about smoothing
387 */
388#define EMI_NOREDRAW 0x01
389#define EMI_SMOOTH 0x02
390
391/* this last one says the bitfield continue un next byte
392 * There may be several on contiguous bytes. So there is 7
393 * actual bits used per byte, and the number of bytes
394 * is not fixed in protocol
395 */
396#define EMI_HASMOREBITS 0x80
397
398#define FACE_TYPES 1 357#define FACE_TYPES 1
399#define PNG_FACE_INDEX 0 358#define PNG_FACE_INDEX 0
400 359
401#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 360#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
402#define VERSION_SC 1026 361#define VERSION_SC 1026

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines