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.30 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.31 by root, Mon Jan 8 18:18:36 2007 UTC

520 * is hopefully in the same place, so the client should preserve 520 * is hopefully in the same place, so the client should preserve
521 * order. 521 * order.
522 */ 522 */
523 } 523 }
524 524
525 client *ns = pl->contr->ns;
526 if (!ns)
527 return;
528
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 529 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 530 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 531 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
528 * this is happening - we can set a breakpoint here in the debugger 532 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call. 533 * and track back the call.
551 sint32 weight = WEIGHT (op); 555 sint32 weight = WEIGHT (op);
552 556
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 557 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 558
555 if (pl == op) 559 if (pl == op)
556 op->contr->last_weight = weight; 560 ns->last_weight = weight;
557 } 561 }
558 562
559 if (flags & UPD_FACE) 563 if (flags & UPD_FACE)
560 { 564 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 565 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 566 esrv_send_face (ns, op->face->number, 0);
563 567
564 sl << uint32 (op->face->number); 568 sl << uint32 (op->face->number);
565 } 569 }
566 570
567 if (flags & UPD_NAME) 571 if (flags & UPD_NAME)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines