| … | |
… | |
| 277 | int mflags; |
277 | int mflags; |
| 278 | |
278 | |
| 279 | if (!spob->other_arch) |
279 | if (!spob->other_arch) |
| 280 | return 0; |
280 | return 0; |
| 281 | |
281 | |
| 282 | tmp = arch_to_object (spob->other_arch); |
282 | tmp = spob->other_arch->instance (); |
| 283 | if (tmp == NULL) |
283 | if (tmp == NULL) |
| 284 | return 0; |
284 | return 0; |
| 285 | |
285 | |
| 286 | /* peterm: level dependency for bolts */ |
286 | /* peterm: level dependency for bolts */ |
| 287 | tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); |
287 | tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); |
| … | |
… | |
| 439 | if (op->destroyed ()) |
439 | if (op->destroyed ()) |
| 440 | return; |
440 | return; |
| 441 | } |
441 | } |
| 442 | |
442 | |
| 443 | /* other_arch contains what this explodes into */ |
443 | /* other_arch contains what this explodes into */ |
| 444 | tmp = arch_to_object (op->other_arch); |
444 | tmp = op->other_arch->instance (); |
| 445 | |
445 | |
| 446 | tmp->set_owner (op); |
446 | tmp->set_owner (op); |
| 447 | tmp->skill = op->skill; |
447 | tmp->skill = op->skill; |
| 448 | |
448 | |
| 449 | owner = op->owner; |
449 | owner = op->owner; |
| … | |
… | |
| 690 | |
690 | |
| 691 | /* drops an object based on what is in the cone's "other_arch" */ |
691 | /* drops an object based on what is in the cone's "other_arch" */ |
| 692 | static void |
692 | static void |
| 693 | cone_drop (object *op) |
693 | cone_drop (object *op) |
| 694 | { |
694 | { |
| 695 | object *new_ob = arch_to_object (op->other_arch); |
695 | object *new_ob = op->other_arch->instance (); |
| 696 | |
696 | |
| 697 | new_ob->level = op->level; |
697 | new_ob->level = op->level; |
| 698 | new_ob->set_owner (op->owner); |
698 | new_ob->set_owner (op->owner); |
| 699 | |
699 | |
| 700 | /* preserve skill ownership */ |
700 | /* preserve skill ownership */ |
| … | |
… | |
| 861 | |
861 | |
| 862 | if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) |
862 | if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) |
| 863 | continue; |
863 | continue; |
| 864 | |
864 | |
| 865 | success = 1; |
865 | success = 1; |
| 866 | tmp = arch_to_object (spell->other_arch); |
866 | tmp = spell->other_arch->instance (); |
| 867 | tmp->set_owner (op); |
867 | tmp->set_owner (op); |
| 868 | set_spell_skill (op, caster, spell, tmp); |
868 | set_spell_skill (op, caster, spell, tmp); |
| 869 | tmp->level = casting_level (caster, spell); |
869 | tmp->level = casting_level (caster, spell); |
| 870 | tmp->attacktype = spell->attacktype; |
870 | tmp->attacktype = spell->attacktype; |
| 871 | |
871 | |
| … | |
… | |
| 973 | for (int i = 1; i < 9; i++) |
973 | for (int i = 1; i < 9; i++) |
| 974 | { |
974 | { |
| 975 | if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) |
975 | if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) |
| 976 | continue; |
976 | continue; |
| 977 | |
977 | |
| 978 | object *tmp = arch_to_object (at); |
978 | object *tmp = at->instance (); |
| 979 | tmp->direction = i; |
979 | tmp->direction = i; |
| 980 | tmp->range = op->range; |
980 | tmp->range = op->range; |
| 981 | tmp->stats.dam = op->stats.dam; |
981 | tmp->stats.dam = op->stats.dam; |
| 982 | tmp->duration = op->duration; |
982 | tmp->duration = op->duration; |
| 983 | tmp->attacktype = op->attacktype; |
983 | tmp->attacktype = op->attacktype; |
| … | |
… | |
| 1017 | new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); |
1017 | new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); |
| 1018 | return 0; |
1018 | return 0; |
| 1019 | } |
1019 | } |
| 1020 | } |
1020 | } |
| 1021 | |
1021 | |
| 1022 | tmp = arch_to_object (spell->other_arch); |
1022 | tmp = spell->other_arch->instance (); |
| 1023 | |
1023 | |
| 1024 | /* level dependencies for bomb */ |
1024 | /* level dependencies for bomb */ |
| 1025 | tmp->range = spell->range + SP_level_range_adjust (caster, spell); |
1025 | tmp->range = spell->range + SP_level_range_adjust (caster, spell); |
| 1026 | tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); |
1026 | tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); |
| 1027 | tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); |
1027 | tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); |
| … | |
… | |
| 1121 | new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); |
1121 | new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); |
| 1122 | return 0; |
1122 | return 0; |
| 1123 | } |
1123 | } |
| 1124 | |
1124 | |
| 1125 | if (spell->other_arch) |
1125 | if (spell->other_arch) |
| 1126 | effect = arch_to_object (spell->other_arch); |
1126 | effect = spell->other_arch->instance (); |
| 1127 | else |
1127 | else |
| 1128 | return 0; |
1128 | return 0; |
| 1129 | |
1129 | |
| 1130 | /* tailor the effect by priest level and worshipped God */ |
1130 | /* tailor the effect by priest level and worshipped God */ |
| 1131 | effect->level = casting_level (caster, spell); |
1131 | effect->level = casting_level (caster, spell); |
| … | |
… | |
| 1305 | if (spell_ob->subtype == SP_DESTRUCTION) |
1305 | if (spell_ob->subtype == SP_DESTRUCTION) |
| 1306 | { |
1306 | { |
| 1307 | hit_player (tmp, dam, op, spell_ob->attacktype, 0); |
1307 | hit_player (tmp, dam, op, spell_ob->attacktype, 0); |
| 1308 | |
1308 | |
| 1309 | if (spell_ob->other_arch) |
1309 | if (spell_ob->other_arch) |
| 1310 | m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); |
1310 | m->insert (spell_ob->other_arch->instance (), nx, ny, op); |
| 1311 | } |
1311 | } |
| 1312 | else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) |
1312 | else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) |
| 1313 | { |
1313 | { |
| 1314 | if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) |
1314 | if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) |
| 1315 | m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); |
1315 | m->insert (spell_ob->other_arch->instance (), nx, ny, op); |
| 1316 | } |
1316 | } |
| 1317 | } |
1317 | } |
| 1318 | } |
1318 | } |
| 1319 | } |
1319 | } |
| 1320 | |
1320 | |
| … | |
… | |
| 1576 | head->stats.exp = 0; |
1576 | head->stats.exp = 0; |
| 1577 | } |
1577 | } |
| 1578 | |
1578 | |
| 1579 | /* If a monster was effected, put an effect in */ |
1579 | /* If a monster was effected, put an effect in */ |
| 1580 | if (done_one && spell->other_arch) |
1580 | if (done_one && spell->other_arch) |
| 1581 | m->insert (arch_to_object (spell->other_arch), nx, ny, op); |
1581 | m->insert (spell->other_arch->instance (), nx, ny, op); |
| 1582 | } |
1582 | } |
| 1583 | |
1583 | |
| 1584 | return 1; |
1584 | return 1; |
| 1585 | } |
1585 | } |
| 1586 | |
1586 | |
| … | |
… | |
| 1669 | hit_map (op, j, op->attacktype, 1); |
1669 | hit_map (op, j, op->attacktype, 1); |
| 1670 | } |
1670 | } |
| 1671 | |
1671 | |
| 1672 | /* insert the other arch */ |
1672 | /* insert the other arch */ |
| 1673 | if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) |
1673 | if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) |
| 1674 | m->insert (arch_to_object (op->other_arch), hx, hy, op); |
1674 | m->insert (op->other_arch->instance (), hx, hy, op); |
| 1675 | } |
1675 | } |
| 1676 | |
1676 | |
| 1677 | /* restore to the center location and damage */ |
1677 | /* restore to the center location and damage */ |
| 1678 | op->stats.dam = dam_save; |
1678 | op->stats.dam = dam_save; |
| 1679 | |
1679 | |
| … | |
… | |
| 1895 | return 0; |
1895 | return 0; |
| 1896 | } |
1896 | } |
| 1897 | } |
1897 | } |
| 1898 | |
1898 | |
| 1899 | /* ok, looks groovy to just insert a new light on the map */ |
1899 | /* ok, looks groovy to just insert a new light on the map */ |
| 1900 | tmp = arch_to_object (spell->other_arch); |
1900 | tmp = spell->other_arch->instance (); |
| 1901 | if (!tmp) |
1901 | if (!tmp) |
| 1902 | { |
1902 | { |
| 1903 | LOG (llevError, "Error: spell arch for cast_light() missing.\n"); |
1903 | LOG (llevError, "Error: spell arch for cast_light() missing.\n"); |
| 1904 | return 0; |
1904 | return 0; |
| 1905 | } |
1905 | } |
| … | |
… | |
| 1971 | { |
1971 | { |
| 1972 | /* search this square for a victim */ |
1972 | /* search this square for a victim */ |
| 1973 | for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) |
1973 | for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) |
| 1974 | if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) |
1974 | if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) |
| 1975 | { /* found a victim */ |
1975 | { /* found a victim */ |
| 1976 | object *disease = arch_to_object (spell->other_arch); |
1976 | object *disease = spell->other_arch->instance (); |
| 1977 | |
1977 | |
| 1978 | disease->set_owner (op); |
1978 | disease->set_owner (op); |
| 1979 | set_spell_skill (op, caster, spell, disease); |
1979 | set_spell_skill (op, caster, spell, disease); |
| 1980 | disease->stats.exp = 0; |
1980 | disease->stats.exp = 0; |
| 1981 | disease->level = casting_level (caster, spell); |
1981 | disease->level = casting_level (caster, spell); |
