ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/image.C
(Generate patch)

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.39 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.43 by root, Sun Jul 1 04:08:14 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
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 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/** \file 25/** \file
26 * Image related communication 26 * Image related communication
27 * 27 *
… …
191 if (mask) 191 if (mask)
192 ns->facecache = 1; 192 ns->facecache = 1;
193} 193}
194 194
195/** 195/**
196 * Client has requested pixmap that it somehow missed getting. 196 * client requested an image. send it rate-limited
197 * This will be called often if the client is 197 * before flushing.
198 * caching images.
199 */ 198 */
200void 199void
201SendFaceCmd (char *buf, int len, client *ns) 200AskFaceCmd (char *buf, int len, client *ns)
202{ 201{
202 int idx = 0, pri = 0;
203
204 sscanf (buf, "%d %d", &idx, &pri);
205
206 const facedata *d = face_data (idx, ns->faceset);
207
208 if (!d)
209 return; // doh
210
211 client::ixsend ix;
212
213 ix.pri = pri;
214 ix.idx = idx;
215 ix.ofs = d->data.size ();
216
217 // the by far most common case will be to insert
218 // right at the end, so no looping.
219 auto (i, ns->ixface.end ());
220 for (; i != ns->ixface.begin (); )
221 if (pri >= (--i)->pri)
222 break;
223
224 ns->ixface.insert (i, ix);
225}
226
227/**
228 * Tells client the picture it has to use
229 * to smooth a picture number given as argument.
230 */
231void
232AskSmooth (char *buf, int len, client *ns)
233{
203 ns->send_image (atoi (buf)); 234 ns->send_face (atoi (buf));
235 ns->flush_fx ();
204} 236}
205 237
206// how lame 238// how lame
207static void print_facename (packet &sl, const facedata &d) 239static void print_facename (packet &sl, const facedata &d)
208{ 240{
… …
279 311
280 // how lame 312 // how lame
281 print_facename (sl, *d); 313 print_facename (sl, *d);
282 send_packet (sl); 314 send_packet (sl);
283 315
316 if (EMI_smooth)
317 {
284 faceinfo *f = face_info (facenum); 318 faceinfo *f = face_info (facenum);
285 if (f->smooth && EMI_smooth) 319
286 { 320 if (f->smooth)
321 {
287 send_face (f->smooth); 322 send_face (f->smooth);
288 323
289 packet sl ("smooth"); 324 packet sl ("smooth");
290 325
291 sl << uint16 (facenum) 326 sl << uint16 (facenum)
292 << uint16 (f->smooth); 327 << uint16 (f->smooth);
293 328
294 send_packet (sl); 329 send_packet (sl);
330 }
295 } 331 }
296} 332}
297 333
298void client::flush_fx () 334void client::flush_fx ()
299{ 335{
300 while (!fxface.empty ()) 336 while (!fxface.empty ())
301 { 337 {
302 packet sl ("fx"); 338 packet fx ("fx");
339 packet sx ("sx");
303 340
304 do 341 do
305 { 342 {
306 faceidx facenum = fxface.back (); fxface.pop_back (); 343 faceidx facenum = fxface.back (); fxface.pop_back ();
307 344
308 const facedata *d = face_data (facenum, faceset); 345 const facedata *d = face_data (facenum, faceset);
309 346
310 if (d) 347 if (d)
311 { 348 {
312 sl << ber32 (facenum) 349 fx << ber32 (facenum)
313 << data8 (d->chksum, CHKSUM_SIZE); 350 << data8 (d->chksum, CHKSUM_SIZE);
314 351
352 if (smoothing)
353 {
315 faceinfo *f = face_info (facenum); 354 faceinfo *f = face_info (facenum);
355
316 if (f->smooth && EMI_smooth) 356 if (f->smooth)
357 {
358 send_face (f->smooth);
359 sx << ber32 (facenum)
317 sl << ber32 (f->smooth); 360 << ber32 (f->smooth)
361 << ber32 (f->smoothlevel);
362 }
363 }
318 } 364 }
319 } 365 }
320 while (!fxface.empty () && sl.room () > CHKSUM_SIZE + 8 + 8); 366 while (!fxface.empty ()
367 && fx.room () > ber32::size + CHKSUM_SIZE + 1
368 && sx.room () > ber32::size * 3);
321 369
322 send_packet (sl); 370 send_packet (fx);
371 if (sx.length () > 3) send_packet (sx);
323 } 372 }
324} 373}
325 374
326void 375void
327client::send_image (faceidx facenum) 376client::send_image (faceidx facenum)
… …
330 if (!facenum) 379 if (!facenum)
331 return; 380 return;
332 381
333 const facedata *d = face_data (facenum, faceset); 382 const facedata *d = face_data (facenum, faceset);
334 383
384 faces_sent[facenum] = true;
385
335 if (!d) 386 if (!d)
336 { 387 {
337 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); 388 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
338 return; 389 return;
339 } 390 }
340 391
341 faces_sent[facenum] = true; 392 //TODO: check type here?
342 393
343 if (force_image_newmap) 394 if (force_image_newmap)
344 force_newmap = true; 395 force_newmap = true;
345 396
346 packet sl; 397 packet sl;
… …
387{ 438{
388 /* Do some checking on the anim_num we got. Note that the animations 439 /* Do some checking on the anim_num we got. Note that the animations
389 * are added in contigous order, so if the number is in the valid 440 * are added in contigous order, so if the number is in the valid
390 * range, it must be a valid animation. 441 * range, it must be a valid animation.
391 */ 442 */
392 if (anim_num < 0 || anim_num > num_animations) 443 if (anim_num < 0 || anim_num >= animations.size ())
393 { 444 {
394 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 445 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
395 return; 446 return;
396 } 447 }
397 448

Diff Legend

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