… | |
… | |
292 | /* this should be passed to this fctn, not effiecent cpu use this way */ |
292 | /* this should be passed to this fctn, not effiecent cpu use this way */ |
293 | int batches = abs (nbatches); |
293 | int batches = abs (nbatches); |
294 | |
294 | |
295 | |
295 | |
296 | /* is the cauldron the right type? */ |
296 | /* is the cauldron the right type? */ |
297 | if (rp->cauldron != cauldron->arch->name) |
297 | if (rp->cauldron != cauldron->arch->archname) |
298 | { |
298 | { |
299 | new_draw_info (NDI_UNIQUE, 0, caster, "You are not using the proper" " facilities for this formula."); |
299 | new_draw_info (NDI_UNIQUE, 0, caster, "You are not using the proper" " facilities for this formula."); |
300 | return 0; |
300 | return 0; |
301 | } |
301 | } |
302 | |
302 | |
… | |
… | |
448 | { |
448 | { |
449 | size_t i; |
449 | size_t i; |
450 | |
450 | |
451 | for (i = 0; i < rp->arch_names; i++) |
451 | for (i = 0; i < rp->arch_names; i++) |
452 | { |
452 | { |
453 | if (item->arch->name == rp->arch_name[i]) |
453 | if (item->arch->archname == rp->arch_name[i]) |
454 | { |
454 | { |
455 | *rp_arch_index = i; |
455 | *rp_arch_index = i; |
456 | break; |
456 | break; |
457 | } |
457 | } |
458 | } |
458 | } |
… | |
… | |
650 | object *tmp = get_random_mon (level / 5); |
650 | object *tmp = get_random_mon (level / 5); |
651 | |
651 | |
652 | remove_contents (cauldron->inv, NULL); |
652 | remove_contents (cauldron->inv, NULL); |
653 | if (!tmp) |
653 | if (!tmp) |
654 | alchemy_failure_effect (op, cauldron, rp, level); |
654 | alchemy_failure_effect (op, cauldron, rp, level); |
655 | else if (summon_hostile_monsters (cauldron, random_roll (1, 10, op, PREFER_LOW), tmp->arch->name)) |
655 | else if (summon_hostile_monsters (cauldron, random_roll (1, 10, op, PREFER_LOW), tmp->arch->archname)) |
656 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s and then pours forth monsters!", &cauldron->name, cauldron_sound ()); |
656 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s and then pours forth monsters!", &cauldron->name, cauldron_sound ()); |
657 | return; |
657 | return; |
658 | |
658 | |
659 | } |
659 | } |
660 | else if (level < 150) |
660 | else if (level < 150) |