| 1 | |
1 | |
| 2 | /* |
2 | /* |
| 3 | * static char *rcsid_c_wiz_c = |
3 | * static char *rcsid_c_wiz_c = |
| 4 | * "$Id: c_wiz.C,v 1.10 2006/09/10 14:54:02 root Exp $"; |
4 | * "$Id: c_wiz.C,v 1.11 2006/09/14 21:16:12 root Exp $"; |
| 5 | */ |
5 | */ |
| 6 | |
6 | |
| 7 | /* |
7 | /* |
| 8 | CrossFire, A Multiplayer game for X-windows |
8 | CrossFire, A Multiplayer game for X-windows |
| 9 | |
9 | |
| … | |
… | |
| 623 | bp2++; |
623 | bp2++; |
| 624 | break; |
624 | break; |
| 625 | } |
625 | } |
| 626 | } |
626 | } |
| 627 | |
627 | |
| 628 | if ((at = find_archetype (bp)) == NULL) |
628 | if ((at = archetype::find (bp)) == NULL) |
| 629 | { |
629 | { |
| 630 | new_draw_info (NDI_UNIQUE, 0, op, "No such archetype."); |
630 | new_draw_info (NDI_UNIQUE, 0, op, "No such archetype."); |
| 631 | return 1; |
631 | return 1; |
| 632 | } |
632 | } |
| 633 | |
633 | |
| … | |
… | |
| 639 | * Try to find a spell object for this. Note that |
639 | * Try to find a spell object for this. Note that |
| 640 | * we also set up spell_name which is only |
640 | * we also set up spell_name which is only |
| 641 | * the first word. |
641 | * the first word. |
| 642 | */ |
642 | */ |
| 643 | |
643 | |
| 644 | at_spell = find_archetype (cp); |
644 | at_spell = archetype::find (cp); |
| 645 | if (!at_spell || at_spell->clone.type != SPELL) |
645 | if (!at_spell || at_spell->clone.type != SPELL) |
| 646 | at_spell = find_archetype_by_object_name (cp); |
646 | at_spell = find_archetype_by_object_name (cp); |
| 647 | if (!at_spell || at_spell->clone.type != SPELL) |
647 | if (!at_spell || at_spell->clone.type != SPELL) |
| 648 | { |
648 | { |
| 649 | strcpy (spell_name, cp); |
649 | strcpy (spell_name, cp); |
| 650 | fsp = strchr (spell_name, ' '); |
650 | fsp = strchr (spell_name, ' '); |
| 651 | if (fsp) |
651 | if (fsp) |
| 652 | { |
652 | { |
| 653 | *fsp = 0; |
653 | *fsp = 0; |
| 654 | fsp++; |
654 | fsp++; |
| 655 | at_spell = find_archetype (spell_name); |
655 | at_spell = archetype::find (spell_name); |
| 656 | |
656 | |
| 657 | /* Got a spell, update the first string pointer */ |
657 | /* Got a spell, update the first string pointer */ |
| 658 | if (at_spell && at_spell->clone.type == SPELL) |
658 | if (at_spell && at_spell->clone.type == SPELL) |
| 659 | bp2 = cp + strlen (spell_name) + 1; |
659 | bp2 = cp + strlen (spell_name) + 1; |
| 660 | else |
660 | else |
