| … | |
… | |
| 564 | { |
564 | { |
| 565 | /* If op->arch has been set, then this new object |
565 | /* If op->arch has been set, then this new object |
| 566 | * must be part of the inventory. So process |
566 | * must be part of the inventory. So process |
| 567 | * appropriately. |
567 | * appropriately. |
| 568 | */ |
568 | */ |
| 569 | archetype *arch = find_archetype (str); |
569 | archetype *arch = archetype::find (str); |
| 570 | |
570 | |
| 571 | object *tmp; |
571 | object *tmp; |
| 572 | |
572 | |
| 573 | if (arch != NULL) |
573 | if (arch != NULL) |
| 574 | tmp = arch_to_object (arch); |
574 | tmp = arch_to_object (arch); |
| … | |
… | |
| 615 | } |
615 | } |
| 616 | } |
616 | } |
| 617 | else |
617 | else |
| 618 | { |
618 | { |
| 619 | /* This is the actual archetype definition then */ |
619 | /* This is the actual archetype definition then */ |
| 620 | op->arch = find_archetype (str); |
620 | op->arch = archetype::find (str); |
| 621 | |
621 | |
| 622 | if (op->arch != NULL) |
622 | if (op->arch != NULL) |
| 623 | copy_object (&op->arch->clone, op); |
623 | copy_object (&op->arch->clone, op); |
| 624 | else if (!arch_init) |
624 | else if (!arch_init) |
| 625 | /* record the name of the broken object */ |
625 | /* record the name of the broken object */ |
| … | |
… | |
| 627 | } |
627 | } |
| 628 | } |
628 | } |
| 629 | break; |
629 | break; |
| 630 | |
630 | |
| 631 | case KW_other_arch: |
631 | case KW_other_arch: |
| 632 | op->other_arch = find_archetype (thawer.get_str ()); |
632 | op->other_arch = archetype::find (thawer.get_str ()); |
| 633 | break; |
633 | break; |
| 634 | |
634 | |
| 635 | case KW_animation: |
635 | case KW_animation: |
| 636 | { |
636 | { |
| 637 | const char *str = thawer.get_str (); |
637 | const char *str = thawer.get_str (); |
