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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.41 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC

264 264
265 flags = query_flags (head); 265 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 267 flags |= F_NOPICK;
268 268
269 if (!(ns.faces_sent[head->face] & NS_FACESENT_FACE))
270 esrv_send_face (&ns, head->face, 0); 269 ns.send_face (head->face);
271 270
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 272 ns.send_animation (head->animation_id);
274 273
275 sl << uint32 (head->count) 274 sl << uint32 (head->count)
276 << uint32 (flags) 275 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
278 << uint32 (head->face); 277 << uint32 (head->face);
356 packet sl; 355 packet sl;
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 357
359 sl << uint32 (0); 358 sl << uint32 (0);
360 359
361 if (!(pl->contr->ns->faces_sent[empty_face] & NS_FACESENT_FACE)) 360 pl->contr->ns->send_face (empty_face);
362 esrv_send_face (pl->contr->ns, empty_face, 0);
363 361
364 if (pl->contr->ns->look_position) 362 if (pl->contr->ns->look_position)
365 { 363 {
366 char buf[80]; 364 char buf[80];
367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
555 ns->last_weight = weight; 553 ns->last_weight = weight;
556 } 554 }
557 555
558 if (flags & UPD_FACE) 556 if (flags & UPD_FACE)
559 { 557 {
560 if (!(ns->faces_sent[op->face] & NS_FACESENT_FACE))
561 esrv_send_face (ns, op->face, 0); 558 ns->send_face (op->face);
562
563 sl << uint32 (op->face); 559 sl << uint32 (op->face);
564 } 560 }
565 561
566 if (flags & UPD_NAME) 562 if (flags & UPD_NAME)
567 { 563 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines