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.57 by root, Sun Jul 1 03:16:56 2007 UTC vs.
Revision 1.64 by root, Thu Jul 26 00:27:08 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#ifndef CLIENT_H 24#ifndef CLIENT_H
… …
84enum { 83enum {
85 PF_PLAYER = 0x01, // must have valid player / will by synchronised 84 PF_PLAYER = 0x01, // must have valid player / will by synchronised
86 PF_PLAYING = 0x02, // must be in playing state 85 PF_PLAYING = 0x02, // must be in playing state
87 PF_COMMAND0 = 0x04, // command starts at offset 0 86 PF_COMMAND0 = 0x04, // command starts at offset 0
88 PF_COMMAND6 = 0x08, // command starts at offset 6 87 PF_COMMAND6 = 0x08, // command starts at offset 6
88};
89
90// face type.s bit 0 means "has meta info prepended"
91enum {
92 FT_FACE = 0 * 2 + 0, // faces (images)
93 FT_MUSIC = 1 * 2 + 1, // background music
94 FT_SOUND = 2 * 2 + 1, // effects
95 FT_RSRC = 3 * 2 + 0, // generic data files
96 FT_NUM,
89}; 97};
90 98
91struct packet_type 99struct packet_type
92{ 100{
93 const char *name; 101 const char *name;
… …
156 bool ACC (RW, sent_scroll); 164 bool ACC (RW, sent_scroll);
157 bool ACC (RW, sound); /* does the client want sound */ 165 bool ACC (RW, sound); /* does the client want sound */
158 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 166 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
159 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */ 167 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
160 bool ACC (RW, mapinfocmd); // return map info and send map change info 168 bool ACC (RW, mapinfocmd); // return map info and send map change info
161 bool ACC (RW, extcmd); // call into extensions/plugins 169 uint8_t ACC (RW, extcmd); // call into extensions/plugins
162 bool ACC (RW, extmap); // extend map comamnd with extra data 170 bool ACC (RW, extmap); // extend map comamnd with extra data
163 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls 171 bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
164 bool ACC (RW, darkness); /* True if client wants darkness information */ 172 bool ACC (RW, darkness); /* True if client wants darkness information */
165 bool ACC (RW, image2); /* Client wants image2/face2 commands */ 173 bool ACC (RW, image2); /* Client wants image2/face2 commands */
166 uint8_t ACC (RW, fxix); // client implements fx and ix (face|image extended) commands 174 uint8_t ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
… …
191 uint8 ACC (RW, faceset); // CF+ selected faceset 199 uint8 ACC (RW, faceset); // CF+ selected faceset
192 200
193 tstamp ACC (RW, last_send); // last data send on socket. 201 tstamp ACC (RW, last_send); // last data send on socket.
194 202
195 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 203 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
204 int ACC (RW, outq); // current socket outq length, or 0 if indeterminable
196 205
197 int ACC (RW, rate_avail); // current rate balance 206 int ACC (RW, rate_avail); // current rate balance
198 int ACC (RW, max_rate); // max. # of bytes to send per tick 207 int ACC (RW, max_rate); // max. # of bytes to send per tick
199 faceidx ACC (RW, scrub_idx); // which face to send next 208 faceidx ACC (RW, scrub_idx); // which face to send next
200 int ACC (RW, bg_scrub); // how many ticks till the next background face send 209 int ACC (RW, bg_scrub); // how many ticks till the next background face send
201 210
202 faceidx partial_face; 211 struct ixsend {
203 uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face 212 int16_t pri; // unused
213 faceidx idx;
214 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
215 };
204 std::vector<faceidx, slice_allocator<faceidx> > ixface; // which faces to send to the client using ix 216 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
205 217
206 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx 218 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
207 MTH void flush_fx (); // send fx if required 219 MTH void flush_fx (); // send fx if required
208 220
209 void do_destroy (); 221 void do_destroy ();
… …
216 228
217 // large structures at the end please 229 // large structures at the end please
218 struct Map lastmap; 230 struct Map lastmap;
219 std::bitset<MAXANIMNUM> anims_sent; 231 std::bitset<MAXANIMNUM> anims_sent;
220 std::bitset<MAX_FACES> faces_sent; 232 std::bitset<MAX_FACES> faces_sent;
233 std::bitset<FT_NUM> fx_want;
221 234
222 // if we get an incomplete packet, this is used to hold the data. 235 // if we get an incomplete packet, this is used to hold the data.
223 // we add 2 byte for the header, one for the trailing 0 byte 236 // we add 2 byte for the header, one for the trailing 0 byte
224 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 237 uint8 inbuf[MAXSOCKBUF + 2 + 1];
225 238
… …
257 void send_packet (const char *buf, int len); 270 void send_packet (const char *buf, int len);
258 void send_packet_printf (const char *format, ...); 271 void send_packet_printf (const char *format, ...);
259 void send_packet (packet &sl); 272 void send_packet (packet &sl);
260 273
261 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 274 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
275
262 MTH void send_face (faceidx facenum); 276 MTH void send_face (faceidx facenum, int pri = 0);
263 MTH void send_image (faceidx facenum); 277 MTH void send_image (faceidx facenum);
264 MTH void send_faces (object *ob); 278 MTH void send_faces (object *ob);
265 MTH void send_animation (short anim_num); 279 MTH void send_animation (short anim_num);
266 void send_msg (int color, const char *type, const char *msg); 280 void send_msg (int color, const char *type, const char *msg);
267 281
282 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
268 // called when something under the player changes 283 // called when something under the player changes
269 MTH void floorbox_update () { update_look = 1; } 284 MTH void floorbox_update () { update_look = 1; }
270 // called when the player has been moved 285 // called when the player has been moved
271 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 286 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
272 287

Diff Legend

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