… | |
… | |
819 | |
819 | |
820 | if (flag [FLAG_IS_LINKED]) |
820 | if (flag [FLAG_IS_LINKED]) |
821 | remove_button_link (this); |
821 | remove_button_link (this); |
822 | |
822 | |
823 | if (flag [FLAG_FRIENDLY]) |
823 | if (flag [FLAG_FRIENDLY]) |
|
|
824 | { |
824 | remove_friendly_object (this); |
825 | remove_friendly_object (this); |
|
|
826 | |
|
|
827 | if (type == GOLEM |
|
|
828 | && owner |
|
|
829 | && owner->type == PLAYER |
|
|
830 | && owner->contr->ranges[range_golem] == this) |
|
|
831 | owner->contr->ranges[range_golem] = 0; |
|
|
832 | } |
825 | |
833 | |
826 | if (!flag [FLAG_REMOVED]) |
834 | if (!flag [FLAG_REMOVED]) |
827 | remove (); |
835 | remove (); |
828 | |
836 | |
829 | destroy_inv (true); |
837 | destroy_inv (true); |
… | |
… | |
2600 | { |
2608 | { |
2601 | static char info[256 * 4]; |
2609 | static char info[256 * 4]; |
2602 | return debug_desc (info); |
2610 | return debug_desc (info); |
2603 | } |
2611 | } |
2604 | |
2612 | |
|
|
2613 | struct region * |
|
|
2614 | object::region () const |
|
|
2615 | { |
|
|
2616 | return map ? map->region (x, y) |
|
|
2617 | : region::default_region (); |
|
|
2618 | } |
|
|
2619 | |