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.10 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.11 by root, Thu Dec 14 20:39:54 2006 UTC

385 sl << uint8 (fallback); 385 sl << uint8 (fallback);
386 386
387 sl << uint32 (facesets[fallback].faces[face_num].checksum) 387 sl << uint32 (facesets[fallback].faces[face_num].checksum)
388 << new_faces[face_num].name; 388 << new_faces[face_num].name;
389 389
390 Send_With_Handling (ns, &sl); 390 ns->send_packet (sl);
391 } 391 }
392 else 392 else
393 { 393 {
394 sl << (ns->image2 ? "image2 " : "image ") 394 sl << (ns->image2 ? "image2 " : "image ")
395 << uint32 (face_num); 395 << uint32 (face_num);
398 sl << uint8 (fallback); 398 sl << uint8 (fallback);
399 399
400 sl << uint32 (facesets[fallback].faces[face_num].datalen) 400 sl << uint32 (facesets[fallback].faces[face_num].datalen)
401 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); 401 << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen);
402 402
403 Send_With_Handling (ns, &sl); 403 ns->send_packet (sl);
404 } 404 }
405 405
406 ns->faces_sent[face_num] |= NS_FACESENT_FACE; 406 ns->faces_sent[face_num] |= NS_FACESENT_FACE;
407} 407}
408 408
423 if (facesets[i].prefix) 423 if (facesets[i].prefix)
424 sl.printf ("%d:%s:%s:%d:%s:%s:%s", 424 sl.printf ("%d:%s:%s:%d:%s:%s:%s",
425 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, 425 i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback,
426 facesets[i].size, facesets[i].extension, facesets[i].comment); 426 facesets[i].size, facesets[i].extension, facesets[i].comment);
427 427
428 Send_With_Handling (ns, &sl); 428 ns->send_packet (sl);
429} 429}
430 430
431/** 431/**
432 * Sends requested face information. 432 * Sends requested face information.
433 * \param ns socket to send to 433 * \param ns socket to send to
482 { 482 {
483 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); 483 LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF);
484 abort (); 484 abort ();
485 } 485 }
486 486
487 Send_With_Handling (ns, &sl); 487 ns->send_packet (sl);
488} 488}
489 489

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines