| … | |
… | |
| 607 | |
607 | |
| 608 | /* We are only dropping some of the items. We split the current object |
608 | /* We are only dropping some of the items. We split the current object |
| 609 | * off |
609 | * off |
| 610 | */ |
610 | */ |
| 611 | if (!can_split (op, tmp, nrof)) |
611 | if (!can_split (op, tmp, nrof)) |
|
|
612 | return; |
| 612 | |
613 | |
| 613 | if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) |
614 | if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) |
| 614 | return; |
615 | return; |
| 615 | |
616 | |
| 616 | if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) |
617 | if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) |
| … | |
… | |
| 634 | return; |
635 | return; |
| 635 | |
636 | |
| 636 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
637 | if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) |
| 637 | { |
638 | { |
| 638 | if (!sell_item (tmp, op)) |
639 | if (!sell_item (tmp, op)) |
| 639 | return; // if we can't sell it we don't drop it |
640 | { |
|
|
641 | // if we can't sell it we don't drop it, so give it back to the seller |
|
|
642 | op->insert (tmp); |
|
|
643 | return; |
|
|
644 | } |
| 640 | } |
645 | } |
| 641 | |
646 | |
| 642 | tmp->x = op->x; |
647 | tmp->x = op->x; |
| 643 | tmp->y = op->y; |
648 | tmp->y = op->y; |
| 644 | |
649 | |
