| … | |
… | |
| 656 | op->spellarg = NULL; |
656 | op->spellarg = NULL; |
| 657 | } |
657 | } |
| 658 | else |
658 | else |
| 659 | op->slaying = NULL; |
659 | op->slaying = NULL; |
| 660 | |
660 | |
| 661 | /* Reset these to zero, so that CAN_MERGE will work properly */ |
661 | /* Reset these to zero, so that object::can_merge will work properly */ |
| 662 | op->spellarg = NULL; |
662 | op->spellarg = NULL; |
| 663 | op->stats.sp = 0; |
663 | op->stats.sp = 0; |
| 664 | op->stats.hp = 0; |
664 | op->stats.hp = 0; |
| 665 | op->stats.grace = 0; |
665 | op->stats.grace = 0; |
| 666 | op->level = 0; |
666 | op->level = 0; |
| … | |
… | |
| 687 | if (op->inv) |
687 | if (op->inv) |
| 688 | { |
688 | { |
| 689 | object *payload = op->inv; |
689 | object *payload = op->inv; |
| 690 | |
690 | |
| 691 | payload->remove (); |
691 | payload->remove (); |
| 692 | clear_owner (payload); |
692 | payload->owner = 0; |
| 693 | insert_ob_in_map (payload, op->map, payload, 0); |
693 | insert_ob_in_map (payload, op->map, payload, 0); |
| 694 | op->destroy (); |
694 | op->destroy (); |
| 695 | } |
695 | } |
| 696 | else |
696 | else |
| 697 | { |
697 | { |
