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.42 by root, Mon Apr 2 18:04:46 2007 UTC vs.
Revision 1.49 by root, Wed Apr 25 18:47:50 2007 UTC

… …
32// (possibly) max. number of objects "per page" in the ground container 32// (possibly) max. number of objects "per page" in the ground container
33#define FLOORBOX_PAGESIZE 50 33#define FLOORBOX_PAGESIZE 50
34 34
35struct MapCell 35struct MapCell
36{ 36{
37 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 37 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 */ 38 int count; /* This is really darkness in the map1 command */
39 faceidx faces[MAP_LAYERS]; 39 faceidx faces[MAP_LAYERS];
40 unsigned char stat_hp; // health of something in this space, or 0 40 unsigned char stat_hp; // health of something in this space, or 0
41 unsigned char flags; 41 unsigned char flags;
42 uint8_t smooth[MAP_LAYERS]; 42 uint8_t smooth[MAP_LAYERS];
… …
67/* Only one map mode can actually be used, so lets make it a switch 67/* 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 68 * instead of having a bunch of different fields that needed to
69 * get toggled. 69 * get toggled.
70 */ 70 */
71enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 71enum { 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 72
83// states the socket can be in 73// states the socket can be in
84enum { 74enum {
85 ST_DEAD, // socket is dead 75 ST_DEAD, // socket is dead
86 ST_SETUP, // initial handshake / setup / login 76 ST_SETUP, // initial handshake / setup / login
87 ST_PLAYING, // logged in an playing 77 ST_PLAYING, // logged in an playing
88 ST_CUSTOM, // waiting for custom reply 78 ST_CUSTOM, // waiting for custom reply
89 79
90 ST_CHANGE_CLASS,
91 ST_GET_PARTY_PASSWORD, 80 ST_GET_PARTY_PASSWORD,
92}; 81};
93 82
94// a handler for a specific type of packet 83// a handler for a specific type of packet
95enum { 84enum {
… …
165 int ACC (RW, fd); 154 int ACC (RW, fd);
166 unsigned int inbuf_len; // number of bytes valid in inbuf 155 unsigned int inbuf_len; // number of bytes valid in inbuf
167 statsinfo stats; 156 statsinfo stats;
168 int ACC (RO, active); 157 int ACC (RO, active);
169 158
170 Buffer outputbuffer; 159 /* The following is the setup for a ring buffer for storing output
160 * data that the OS can't handle right away.
161 */
162 struct
163 {
164 char data[SOCKETBUFSIZE];
165 int start;
166 int len;
167 } outputbuffer;
171 168
172 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 169 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 */ 170 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
174 171
175 sint8 ACC (RW, last_level); /* Last level we sent to client */ 172 sint8 ACC (RW, last_level); /* Last level we sent to client */
… …
200 bool ACC (RW, extcmd); // call into extensions/plugins 197 bool ACC (RW, extcmd); // call into extensions/plugins
201 bool ACC (RW, extmap); // extend map comamnd with extra data 198 bool ACC (RW, extmap); // extend map comamnd with extra data
202 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls 199 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
203 bool ACC (RW, darkness); /* True if client wants darkness information */ 200 bool ACC (RW, darkness); /* True if client wants darkness information */
204 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 201 bool ACC (RW, image2); /* Client wants image2/face2 commands */
202 bool ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
205 bool ACC (RW, update_look); /* If true, we need to send the look window */ 203 bool ACC (RW, update_look); /* If true, we need to send the look window */
206 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 204 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
207 /* used to arrange text in books, scrolls, or scripted dialogs */ 205 /* used to arrange text in books, scrolls, or scripted dialogs */
208 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 206 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
209 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */ 207 bool ACC (RW, ext_mapinfos); /* If true client accepts additional info on maps */
210 /* Below are flags for extedend infos to pass to client 208 /* Below are flags for extedend infos to pass to client
211 * with S->C mapextended command */ 209 * with S->C mapextended command */
212 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */ 210 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
211 bool ACC (RW, smoothing); // trt-style smoothing
212 bool ACC (RW, can_msg); // trt-style text messages
213 213
214 bool ACC (RW, force_newmap); // force a newmap before next map update 214 bool ACC (RW, force_newmap); // force a newmap before next map update
215 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 215 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
216 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 216 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
217 uint16 ACC (RW, look_position); /* start of drawing of look window */ 217 uint16 ACC (RW, look_position); /* start of drawing of look window */
218 uint16 ACC (RW, mss); // likely tcp maximum segment size
218 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */ 219 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
219 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 */
220 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 */
221 222
222 maptile *ACC (RW, current_map); // CF+ last/current player map 223 maptile *ACC (RW, current_map); // CF+ last/current player map
223 region *ACC (RW, current_region); // CF+ last/current player region 224 region *ACC (RW, current_region); // CF+ last/current player region
224 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
225 char ACC (RW, version)[64]; // CF+ client name/version 226 shstr ACC (RW, version); // CF+ client name/version
226 uint8 ACC (RW, faceset); // CF+ selected faceset 227 uint8 ACC (RW, faceset); // CF+ selected faceset
227 228
228 player_ptr ACC (RO, pl); 229 player_ptr ACC (RO, pl);
229 230
230 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 */
231 232
233 int ACC (RW, rate_avail); // current rate balance
232 int ACC (RW, max_rate); // max. # of bytes to send per tick 234 int ACC (RW, max_rate); // max. # of bytes to send per tick
233 faceidx ACC (RW, scrub_idx); // which face to send next 235 faceidx ACC (RW, scrub_idx); // which face to send next
234 int ACC (RW, bg_scrub); // how many ticks till the next background face send 236 int ACC (RW, bg_scrub); // how many ticks till the next background face send
237
238 faceidx partial_face;
239 uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face
235 std::vector<faceidx> askface; // which faces have been requested by the client 240 std::vector<faceidx, slice_allocator<faceidx> > askface; // which faces have been requested by the client
241
242 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
243 MTH void flush_fx (); // send fx if required
236 244
237 void do_destroy (); 245 void do_destroy ();
238 void gather_callbacks (AV *&callbacks, event_type event) const; 246 void gather_callbacks (AV *&callbacks, event_type event) const;
239 247
240 iow socket_ev; void socket_cb (iow &w, int got); 248 iow socket_ev; void socket_cb (iow &w, int got);
… …
249 std::bitset<MAX_FACES> faces_sent; 257 std::bitset<MAX_FACES> faces_sent;
250 258
251 // if we get an incomplete packet, this is used to hold the data. 259 // if we get an incomplete packet, this is used to hold the data.
252 // we add 2 byte for the header, one for the trailing 0 byte 260 // we add 2 byte for the header, one for the trailing 0 byte
253 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 261 uint8 inbuf[MAXSOCKBUF + 2 + 1];
262
263 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
264 struct msg_buf
265 {
266 tick_t expire;
267 int len;
268 int count;
269 char msg[MSG_BUF_SIZE];
270 } msgbuf[MSG_BUF_COUNT];
271
272 MTH bool msg_suppressed (const char *msg);
254 273
255 bool may_execute (const packet_type *pkt) const; 274 bool may_execute (const packet_type *pkt) const;
256 void execute (const packet_type *pkt, char *data, int datalen); 275 void execute (const packet_type *pkt, char *data, int datalen);
257 276
258 void queue_command (packet_type *handler, char *data, int datalen); 277 void queue_command (packet_type *handler, char *data, int datalen);
… …
279 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 298 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
280 MTH void send_face (faceidx facenum); 299 MTH void send_face (faceidx facenum);
281 MTH void send_image (faceidx facenum); 300 MTH void send_image (faceidx facenum);
282 MTH void send_faces (object *ob); 301 MTH void send_faces (object *ob);
283 MTH void send_animation (short anim_num); 302 MTH void send_animation (short anim_num);
303 MTH void send_msg (int color, const char *type, const char *msg);
284 304
285 // called when something under the player changes 305 // called when something under the player changes
286 MTH void floorbox_update () { update_look = 1; } 306 MTH void floorbox_update () { update_look = 1; }
287 // called when the player has been moved 307 // called when the player has been moved
288 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 308 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }

Diff Legend

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