| … | |
… | |
| 747 | return 0; |
747 | return 0; |
| 748 | } |
748 | } |
| 749 | else |
749 | else |
| 750 | { |
750 | { |
| 751 | object *tmp; |
751 | object *tmp; |
| 752 | tag_t c = op->count; |
|
|
| 753 | |
752 | |
| 754 | CLEAR_FLAG (op, FLAG_UNPAID); |
753 | CLEAR_FLAG (op, FLAG_UNPAID); |
| 755 | CLEAR_FLAG (op, FLAG_PLAYER_SOLD); |
754 | CLEAR_FLAG (op, FLAG_PLAYER_SOLD); |
| 756 | new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); |
755 | new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); |
| 757 | tmp = merge_ob (op, NULL); |
756 | tmp = merge_ob (op, NULL); |
| 758 | |
757 | |
| 759 | if (pl->type == PLAYER) |
758 | if (pl->type == PLAYER) |
| 760 | { |
759 | { |
| 761 | if (tmp) |
760 | if (tmp) |
| 762 | { /* it was merged */ |
761 | { /* it was merged */ |
| 763 | esrv_del_item (pl->contr, c); |
762 | esrv_del_item (pl->contr, op->count); |
| 764 | op = tmp; |
763 | op = tmp; |
| 765 | } |
764 | } |
| 766 | |
765 | |
| 767 | esrv_send_item (pl, op); |
766 | esrv_send_item (pl, op); |
| 768 | } |
767 | } |
