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.59 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC

271 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])
272 ns.send_animation (head->animation_id); 272 ns.send_animation (head->animation_id);
273 273
274 sl << uint32 (head->count) 274 sl << uint32 (head->count)
275 << uint32 (flags) 275 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face); 277 << uint32 (head->face);
278 278
279 if (!head->custom_name) 279 if (!head->custom_name)
280 { 280 {
281 strncpy (item_n, query_base_name (head, 0), 127); 281 strncpy (item_n, query_base_name (head, 0), 127);
546 if (flags & UPD_FLAGS) 546 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 547 sl << uint32 (query_flags (op));
548 548
549 if (flags & UPD_WEIGHT) 549 if (flags & UPD_WEIGHT)
550 { 550 {
551 sint32 weight = WEIGHT (op); 551 sint32 weight = op->client_weight ();
552 552
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554 554
555#if 0
555 if (pl == op) 556 if (pl == op)
556 ns->last_weight = weight; 557 ns->last_weight = weight;
558#endif
557 } 559 }
558 560
559 if (flags & UPD_FACE) 561 if (flags & UPD_FACE)
560 { 562 {
561 ns->send_face (op->face, -50); 563 ns->send_face (op->face, -50);
635 return; 637 return;
636 638
637 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
638 if (op != pl) 640 if (op != pl)
639 { 641 {
640 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visible' objects to the client */
641 if (!op->client_visible ()) 643 if (!op->client_visible ())
642 return; 644 return;
643 645
644 /* if the item is on the ground, mark that the look needs to 646 /* if the item is on the ground, mark that the look needs to
645 * be updated. 647 * be updated.
922 /* If it is an active container, then we should drop all objects 924 /* If it is an active container, then we should drop all objects
923 * in the container and not the container itself. 925 * in the container and not the container itself.
924 */ 926 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 927 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926 { 928 {
927 object *current, *next;
928
929 int cnt = MAX_ITEM_PER_DROP; 929 int cnt = MAX_ITEM_PER_DROP;
930 930
931 for (current = op->inv; current != NULL; current = next) 931 for (object *current = op->inv; current; )
932 { 932 {
933 next = current->below; 933 object *next = current->below;
934
934 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
935 936
936 if (--cnt <= 0) break; 937 if (--cnt <= 0) break;
938
939 current = next;
937 } 940 }
938 941
939 if (cnt <= 0) 942 if (cnt <= 0)
940 op->failmsg ("Only dropped some items, can't drop that many items at once."); 943 op->failmsg ("Only dropped some items, can't drop that many items at once.");
941
942 esrv_update_item (UPD_WEIGHT, pl, op);
943 } 944 }
944 else 945 else
945 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
946 947
947 update_after_inventory_change (pl); 948 update_after_inventory_change (pl);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines