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.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.31 by root, Mon Jan 8 18:18:36 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 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
519 * is hopefully in the same place, so the client should preserve 520 * is hopefully in the same place, so the client should preserve
520 * order. 521 * order.
521 */ 522 */
522 } 523 }
523 524
525 client *ns = pl->contr->ns;
526 if (!ns)
527 return;
528
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 529 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 530 {
526 /* 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
527 * 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
528 * and track back the call. 533 * and track back the call.
550 sint32 weight = WEIGHT (op); 555 sint32 weight = WEIGHT (op);
551 556
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 557 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553 558
554 if (pl == op) 559 if (pl == op)
555 op->contr->last_weight = weight; 560 ns->last_weight = weight;
556 } 561 }
557 562
558 if (flags & UPD_FACE) 563 if (flags & UPD_FACE)
559 { 564 {
560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 565 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
561 esrv_send_face (pl->contr->ns, op->face->number, 0); 566 esrv_send_face (ns, op->face->number, 0);
562 567
563 sl << uint32 (op->face->number); 568 sl << uint32 (op->face->number);
564 } 569 }
565 570
566 if (flags & UPD_NAME) 571 if (flags & UPD_NAME)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines