| … | |
… | |
| 83 | */ |
83 | */ |
| 84 | void |
84 | void |
| 85 | spell_effect (object *spob, int x, int y, maptile *map, object *originator) |
85 | spell_effect (object *spob, int x, int y, maptile *map, object *originator) |
| 86 | { |
86 | { |
| 87 | if (spob->other_arch) |
87 | if (spob->other_arch) |
| 88 | map->insert (arch_to_object (spob->other_arch), x, y, originator); |
88 | map->insert (spob->other_arch->instance (), x, y, originator); |
| 89 | } |
89 | } |
| 90 | |
90 | |
| 91 | static int |
91 | static int |
| 92 | attuned_bonus (object *caster, object *spell, int level) |
92 | attuned_bonus (object *caster, object *spell, int level) |
| 93 | { |
93 | { |
| … | |
… | |
| 659 | * insert multipart monsters properly |
659 | * insert multipart monsters properly |
| 660 | */ |
660 | */ |
| 661 | //TODO: use expand_tail + ... |
661 | //TODO: use expand_tail + ... |
| 662 | while (at != NULL) |
662 | while (at != NULL) |
| 663 | { |
663 | { |
| 664 | tmp = arch_to_object (at); |
664 | tmp = at->instance (); |
| 665 | tmp->x = op->x + freearr_x[dir] + at->x; |
665 | tmp->x = op->x + freearr_x[dir] + at->x; |
| 666 | tmp->y = op->y + freearr_y[dir] + at->y; |
666 | tmp->y = op->y + freearr_y[dir] + at->y; |
| 667 | tmp->map = op->map; |
667 | tmp->map = op->map; |
| 668 | if (head) |
668 | if (head) |
| 669 | { |
669 | { |
| … | |
… | |
| 892 | { |
892 | { |
| 893 | LOG (llevError, "cast_party_spell: empty other arch\n"); |
893 | LOG (llevError, "cast_party_spell: empty other arch\n"); |
| 894 | return 0; |
894 | return 0; |
| 895 | } |
895 | } |
| 896 | |
896 | |
| 897 | object *spell = arch_to_object (spell_ob->other_arch); |
897 | object *spell = spell_ob->other_arch->instance (); |
| 898 | |
898 | |
| 899 | /* Always cast spell on caster */ |
899 | /* Always cast spell on caster */ |
| 900 | int success = cast_spell (op, caster, dir, spell, spellparam); |
900 | int success = cast_spell (op, caster, dir, spell, spellparam); |
| 901 | |
901 | |
| 902 | if (!op->contr || !op->contr->party) |
902 | if (!op->contr || !op->contr->party) |
