| … | |
… | |
| 69 | find_archetype_by_object_name (const char *name) |
69 | find_archetype_by_object_name (const char *name) |
| 70 | { |
70 | { |
| 71 | shstr_cmp name_cmp (name); |
71 | shstr_cmp name_cmp (name); |
| 72 | |
72 | |
| 73 | for_all_archetypes (at) |
73 | for_all_archetypes (at) |
| 74 | if (at->archname == name_cmp) |
74 | if (at->name == name_cmp) |
| 75 | return at; |
75 | return at; |
| 76 | |
76 | |
| 77 | return 0; |
77 | return 0; |
| 78 | } |
78 | } |
| 79 | |
79 | |
| … | |
… | |
| 86 | find_archetype_by_object_type_name (int type, const char *name) |
86 | find_archetype_by_object_type_name (int type, const char *name) |
| 87 | { |
87 | { |
| 88 | shstr_cmp name_cmp (name); |
88 | shstr_cmp name_cmp (name); |
| 89 | |
89 | |
| 90 | for_all_archetypes (at) |
90 | for_all_archetypes (at) |
| 91 | if (at->archname == name_cmp && at->type == type) |
91 | if (at->name == name_cmp && at->type == type) |
| 92 | return at; |
92 | return at; |
| 93 | |
93 | |
| 94 | return 0; |
94 | return 0; |
| 95 | } |
95 | } |
| 96 | |
96 | |
| … | |
… | |
| 520 | |
520 | |
| 521 | if (!strcmp (name, "bug")) |
521 | if (!strcmp (name, "bug")) |
| 522 | abort (); |
522 | abort (); |
| 523 | |
523 | |
| 524 | char buf[MAX_BUF]; |
524 | char buf[MAX_BUF]; |
| 525 | sprintf (buf, "bug, please report (%s)", ARCH_SINGULARITY, name); |
525 | sprintf (buf, "bug, please report (%s)", name); |
| 526 | |
526 | |
| 527 | object *op = get_archetype ("bug"); |
527 | object *op = get_archetype ("bug"); |
| 528 | op->name = op->name_pl = buf; |
528 | op->name = op->name_pl = buf; |
| 529 | |
529 | |
| 530 | return op; |
530 | return op; |
