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.45 by root, Thu Jul 5 10:34:08 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** \file 24/** \file
26 * Image related communication 25 * Image related communication
27 * 26 *
… …
191 if (mask) 190 if (mask)
192 ns->facecache = 1; 191 ns->facecache = 1;
193} 192}
194 193
195/** 194/**
196 * Client has requested pixmap that it somehow missed getting. 195 * client requested an image. send it rate-limited
197 * This will be called often if the client is 196 * before flushing.
198 * caching images.
199 */ 197 */
200void 198void
201SendFaceCmd (char *buf, int len, client *ns) 199AskFaceCmd (char *buf, int len, client *ns)
202{ 200{
201 int idx = 0, pri = 0;
202
203 sscanf (buf, "%d %d", &idx, &pri);
204
205 const facedata *d = face_data (idx, ns->faceset);
206
207 if (!d)
208 return; // doh
209
210 client::ixsend ix;
211
212 ix.pri = pri;
213 ix.idx = idx;
214 ix.ofs = d->data.size ();
215
216 // this is (hopefully) a temporary fix around older cfplus versions not
217 // supporting interleaved transfers
218 ns->ixface.insert (ns->ixface.begin (), ix);
219
220#if 0
221 // the by far most common case will be to insert
222 // right at the end, so no looping.
223 auto (i, ns->ixface.end ());
224 for (; i != ns->ixface.begin (); )
225 if (pri >= (--i)->pri)
226 break;
227
228 ns->ixface.insert (i, ix);
229#endif
230}
231
232/**
233 * Tells client the picture it has to use
234 * to smooth a picture number given as argument.
235 */
236void
237AskSmooth (char *buf, int len, client *ns)
238{
203 ns->send_image (atoi (buf)); 239 ns->send_face (atoi (buf));
240 ns->flush_fx ();
204} 241}
205 242
206// how lame 243// how lame
207static void print_facename (packet &sl, const facedata &d) 244static void print_facename (packet &sl, const facedata &d)
208{ 245{
… …
279 316
280 // how lame 317 // how lame
281 print_facename (sl, *d); 318 print_facename (sl, *d);
282 send_packet (sl); 319 send_packet (sl);
283 320
321 if (EMI_smooth)
322 {
284 faceinfo *f = face_info (facenum); 323 faceinfo *f = face_info (facenum);
285 if (f->smooth && EMI_smooth) 324
286 { 325 if (f->smooth)
326 {
287 send_face (f->smooth); 327 send_face (f->smooth);
288 328
289 packet sl ("smooth"); 329 packet sl ("smooth");
290 330
291 sl << uint16 (facenum) 331 sl << uint16 (facenum)
292 << uint16 (f->smooth); 332 << uint16 (f->smooth);
293 333
294 send_packet (sl); 334 send_packet (sl);
335 }
295 } 336 }
296} 337}
297 338
298void client::flush_fx () 339void client::flush_fx ()
299{ 340{
300 while (!fxface.empty ()) 341 while (!fxface.empty ())
301 { 342 {
302 packet sl ("fx"); 343 packet fx ("fx");
344 packet sx ("sx");
303 345
304 do 346 do
305 { 347 {
306 faceidx facenum = fxface.back (); fxface.pop_back (); 348 faceidx facenum = fxface.back (); fxface.pop_back ();
307 349
308 const facedata *d = face_data (facenum, faceset); 350 const facedata *d = face_data (facenum, faceset);
309 351
310 if (d) 352 if (d)
311 { 353 {
312 sl << ber32 (facenum) 354 fx << ber32 (facenum)
313 << data8 (d->chksum, CHKSUM_SIZE); 355 << data8 (d->chksum, CHKSUM_SIZE);
314 356
357 if (smoothing)
358 {
315 faceinfo *f = face_info (facenum); 359 faceinfo *f = face_info (facenum);
360
316 if (f->smooth && EMI_smooth) 361 if (f->smooth)
362 {
363 send_face (f->smooth);
364 sx << ber32 (facenum)
317 sl << ber32 (f->smooth); 365 << ber32 (f->smooth)
366 << ber32 (f->smoothlevel);
367 }
368 }
318 } 369 }
319 } 370 }
320 while (!fxface.empty () && sl.room () > CHKSUM_SIZE + 8 + 8); 371 while (!fxface.empty ()
372 && fx.room () > ber32::size + CHKSUM_SIZE + 1
373 && sx.room () > ber32::size * 3);
321 374
322 send_packet (sl); 375 send_packet (fx);
376 if (sx.length () > 3) send_packet (sx);
323 } 377 }
324} 378}
325 379
326void 380void
327client::send_image (faceidx facenum) 381client::send_image (faceidx facenum)
… …
330 if (!facenum) 384 if (!facenum)
331 return; 385 return;
332 386
333 const facedata *d = face_data (facenum, faceset); 387 const facedata *d = face_data (facenum, faceset);
334 388
389 faces_sent[facenum] = true;
390
335 if (!d) 391 if (!d)
336 { 392 {
337 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); 393 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
338 return; 394 return;
339 } 395 }
340 396
341 faces_sent[facenum] = true; 397 //TODO: check type here?
342 398
343 if (force_image_newmap) 399 if (force_image_newmap)
344 force_newmap = true; 400 force_newmap = true;
345 401
346 packet sl; 402 packet sl;
… …
387{ 443{
388 /* Do some checking on the anim_num we got. Note that the animations 444 /* 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 445 * are added in contigous order, so if the number is in the valid
390 * range, it must be a valid animation. 446 * range, it must be a valid animation.
391 */ 447 */
392 if (anim_num < 0 || anim_num > num_animations) 448 if (anim_num < 0 || anim_num >= animations.size ())
393 { 449 {
394 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 450 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
395 return; 451 return;
396 } 452 }
397 453

Diff Legend

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