| … | |
… | |
| 689 | { |
689 | { |
| 690 | mapspace &ms = *pos; |
690 | mapspace &ms = *pos; |
| 691 | ms.update (); |
691 | ms.update (); |
| 692 | |
692 | |
| 693 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
693 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
| 694 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; nrof %d, volume %lld\n\n", |
694 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n", |
| 695 | &pos.m->path, pos.x, pos.y, dx, dy, |
695 | &pos.m->path, pos.x, pos.y, dx, dy, |
| 696 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
696 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
| 697 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.nrof (), (long long)ms.volume () |
697 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume () |
| 698 | ); |
698 | ); |
| 699 | } |
699 | } |
| 700 | else |
700 | else |
| 701 | buf << "off-map\n\n"; |
701 | buf << "off-map\n\n"; |
| 702 | } |
702 | } |
| … | |
… | |
| 772 | /* If it is an active container, then we should drop all objects |
772 | /* If it is an active container, then we should drop all objects |
| 773 | * in the container and not the container itself. |
773 | * in the container and not the container itself. |
| 774 | */ |
774 | */ |
| 775 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
775 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
| 776 | { |
776 | { |
| 777 | int cnt = MAX_ITEM_PER_DROP; |
777 | int cnt = MAX_ITEM_PER_ACTION; |
| 778 | |
778 | |
| 779 | for (object *current = op->inv; current && cnt--; ) |
779 | for (object *current = op->inv; current && cnt--; ) |
| 780 | { |
780 | { |
| 781 | object *next = current->below; |
781 | object *next = current->below; |
| 782 | drop_object (pl, current, 0); |
782 | drop_object (pl, current, 0); |
