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.33 by root, Wed Mar 14 16:23:26 2007 UTC vs.
Revision 1.41 by root, Thu Apr 12 14:18:06 2007 UTC

255 if (faces_sent[facenum]) 255 if (faces_sent[facenum])
256 return; 256 return;
257 257
258 faces_sent[facenum] = true; 258 faces_sent[facenum] = true;
259 259
260 // if for some reason we let a client without face caching connect,
261 // we better support that decision here and implement it.
260 if (!facecache) 262 if (!facecache)
261 {
262 send_drawinfo (
263 "*** Please enable image/face caching in preferences or use a client that supports it.\n",
264 NDI_RED
265 );
266 return send_image (facenum); 263 return send_image (facenum);
264
265 if (fxix)
266 {
267 fxface.push_back (facenum);
268 return;
267 } 269 }
268 270
269 packet sl; 271 packet sl;
270 272
271 if (force_face0) 273 if (force_face0)
277 279
278 // how lame 280 // how lame
279 print_facename (sl, *d); 281 print_facename (sl, *d);
280 send_packet (sl); 282 send_packet (sl);
281 283
284 if (EMI_smooth)
285 {
282 faceinfo *f = face_info (facenum); 286 faceinfo *f = face_info (facenum);
283 if (f->smooth && EMI_smooth) 287
284 { 288 if (f->smooth)
289 {
285 send_face (f->smooth); 290 send_face (f->smooth);
286 291
287 packet sl ("smooth"); 292 packet sl ("smooth");
288 293
289 sl << uint16 (facenum) 294 sl << uint16 (facenum)
290 << uint16 (f->smooth); 295 << uint16 (f->smooth);
291 296
292 send_packet (sl); 297 send_packet (sl);
298 }
299 }
300}
301
302void client::flush_fx ()
303{
304 while (!fxface.empty ())
305 {
306 packet fx ("fx");
307 packet sx ("sx");
308
309 do
310 {
311 faceidx facenum = fxface.back (); fxface.pop_back ();
312
313 const facedata *d = face_data (facenum, faceset);
314
315 if (d)
316 {
317 fx << ber32 (facenum)
318 << data8 (d->chksum, CHKSUM_SIZE);
319
320 if (smoothing)
321 {
322 faceinfo *f = face_info (facenum);
323
324 if (f->smooth)
325 {
326 send_face (f->smooth);
327 sx << ber32 (facenum)
328 << ber32 (f->smooth)
329 << ber32 (f->smoothlevel);
330 }
331 }
332 }
333 }
334 while (!fxface.empty ()
335 && fx.room () > ber32::size + CHKSUM_SIZE + 1
336 && sx.room () > ber32::size * 3);
337
338 send_packet (fx);
339 if (sx.length () > 3) send_packet (sx);
293 } 340 }
294} 341}
295 342
296void 343void
297client::send_image (faceidx facenum) 344client::send_image (faceidx facenum)
305 if (!d) 352 if (!d)
306 { 353 {
307 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum); 354 LOG (llevError, "client::send_image (%d) out of bounds??\n", facenum);
308 return; 355 return;
309 } 356 }
357
358 faces_sent[facenum] = true;
359
360 if (force_image_newmap)
361 force_newmap = true;
310 362
311 packet sl; 363 packet sl;
312 364
313 sl << (image2 ? "image2 " : "image ") 365 sl << (image2 ? "image2 " : "image ")
314 << uint32 (facenum); 366 << uint32 (facenum);
352{ 404{
353 /* Do some checking on the anim_num we got. Note that the animations 405 /* Do some checking on the anim_num we got. Note that the animations
354 * are added in contigous order, so if the number is in the valid 406 * are added in contigous order, so if the number is in the valid
355 * range, it must be a valid animation. 407 * range, it must be a valid animation.
356 */ 408 */
357 if (anim_num < 0 || anim_num > num_animations) 409 if (anim_num < 0 || anim_num >= animations.size ())
358 { 410 {
359 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 411 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
360 return; 412 return;
361 } 413 }
362 414

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines