1 | |
1 | |
2 | /* |
2 | /* |
3 | * static char *rcs_treasure_c = |
3 | * static char *rcs_treasure_c = |
4 | * "$Id: treasure.C,v 1.17 2006/09/12 18:15:34 root Exp $"; |
4 | * "$Id: treasure.C,v 1.18 2006/09/14 21:16:11 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 | |
… | |
… | |
58 | { |
58 | { |
59 | int prev_warn = warn_archetypes; |
59 | int prev_warn = warn_archetypes; |
60 | |
60 | |
61 | warn_archetypes = 1; |
61 | warn_archetypes = 1; |
62 | if (ring_arch == NULL) |
62 | if (ring_arch == NULL) |
63 | ring_arch = find_archetype ("ring"); |
63 | ring_arch = archetype::find ("ring"); |
64 | if (amulet_arch == NULL) |
64 | if (amulet_arch == NULL) |
65 | amulet_arch = find_archetype ("amulet"); |
65 | amulet_arch = archetype::find ("amulet"); |
66 | if (staff_arch == NULL) |
66 | if (staff_arch == NULL) |
67 | staff_arch = find_archetype ("staff"); |
67 | staff_arch = archetype::find ("staff"); |
68 | if (crown_arch == NULL) |
68 | if (crown_arch == NULL) |
69 | crown_arch = find_archetype ("crown"); |
69 | crown_arch = archetype::find ("crown"); |
70 | warn_archetypes = prev_warn; |
70 | warn_archetypes = prev_warn; |
71 | } |
71 | } |
72 | |
72 | |
73 | /* |
73 | /* |
74 | * Allocate and return the pointer to an empty treasurelist structure. |
74 | * Allocate and return the pointer to an empty treasurelist structure. |
… | |
… | |
119 | while (isspace (*cp)) /* Skip blanks */ |
119 | while (isspace (*cp)) /* Skip blanks */ |
120 | cp++; |
120 | cp++; |
121 | |
121 | |
122 | if (sscanf (cp, "arch %s", variable)) |
122 | if (sscanf (cp, "arch %s", variable)) |
123 | { |
123 | { |
124 | if ((t->item = find_archetype (variable)) == NULL) |
124 | if ((t->item = archetype::find (variable)) == NULL) |
125 | LOG (llevError, "Treasure lacks archetype: %s\n", variable); |
125 | LOG (llevError, "Treasure lacks archetype: %s\n", variable); |
126 | } |
126 | } |
127 | else if (sscanf (cp, "list %s", variable)) |
127 | else if (sscanf (cp, "list %s", variable)) |
128 | t->name = variable; |
128 | t->name = variable; |
129 | else if (sscanf (cp, "change_name %s", variable)) |
129 | else if (sscanf (cp, "change_name %s", variable)) |