--- deliantra/server/socket/item.C 2008/04/22 02:46:18 1.59 +++ deliantra/server/socket/item.C 2008/04/22 07:01:47 1.60 @@ -273,7 +273,7 @@ sl << uint32 (head->count) << uint32 (flags) - << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) + << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) << uint32 (head->face); if (!head->custom_name) @@ -548,12 +548,14 @@ if (flags & UPD_WEIGHT) { - sint32 weight = WEIGHT (op); + sint32 weight = op->client_weight (); sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); +#if 0 if (pl == op) ns->last_weight = weight; +#endif } if (flags & UPD_FACE) @@ -637,7 +639,7 @@ /* If this is not the player object, do some more checks */ if (op != pl) { - /* We only send 'visibile' objects to the client */ + /* We only send 'visible' objects to the client */ if (!op->client_visible ()) return; @@ -924,22 +926,21 @@ */ if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) { - object *current, *next; - int cnt = MAX_ITEM_PER_DROP; - for (current = op->inv; current != NULL; current = next) + for (object *current = op->inv; current; ) { - next = current->below; + object *next = current->below; + drop_object (pl, current, 0); if (--cnt <= 0) break; + + current = next; } if (cnt <= 0) op->failmsg ("Only dropped some items, can't drop that many items at once."); - - esrv_update_item (UPD_WEIGHT, pl, op); } else drop_object (pl, op, nrof);