| … | |
… | |
| 771 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
771 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
| 772 | mt = name_to_material (op->materialname); |
772 | mt = name_to_material (op->materialname); |
| 773 | |
773 | |
| 774 | #ifdef NEW_MATERIAL_CODE |
774 | #ifdef NEW_MATERIAL_CODE |
| 775 | if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt && |
775 | if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt && |
| 776 | op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL)) |
776 | op->arch->materialname != mt->name && !(op->material & M_SPECIAL)) |
| 777 | { |
777 | { |
| 778 | strcpy (buf, mt->description); |
778 | strcpy (buf, mt->description); |
| 779 | len = strlen (buf); |
779 | len = strlen (buf); |
| 780 | safe_strcat (buf, " ", &len, MAX_BUF); |
780 | safe_strcat (buf, " ", &len, MAX_BUF); |
| 781 | if (!plural) |
781 | if (!plural) |
| … | |
… | |
| 934 | { |
934 | { |
| 935 | treasure *t; |
935 | treasure *t; |
| 936 | int first = 1; |
936 | int first = 1; |
| 937 | |
937 | |
| 938 | for (t = op->randomitems->items; t != NULL; t = t->next) |
938 | for (t = op->randomitems->items; t != NULL; t = t->next) |
| 939 | if (t->item && t->item->clone.type == SPELL) |
939 | if (t->item && t->item->type == SPELL) |
| 940 | { |
940 | { |
| 941 | if (first) |
941 | if (first) |
| 942 | { |
942 | { |
| 943 | first = 0; |
943 | first = 0; |
| 944 | strcat (retbuf, "(Spell abilities:)"); |
944 | strcat (retbuf, "(Spell abilities:)"); |
| 945 | } |
945 | } |
| 946 | strcat (retbuf, "("); |
946 | strcat (retbuf, "("); |
| 947 | strcat (retbuf, t->item->clone.name); |
947 | strcat (retbuf, t->item->object::name); |
| 948 | strcat (retbuf, ")"); |
948 | strcat (retbuf, ")"); |
| 949 | } |
949 | } |
| 950 | } |
950 | } |
| 951 | if (op->type == PLAYER) |
951 | if (op->type == PLAYER) |
| 952 | { |
952 | { |
| … | |
… | |
| 1520 | { |
1520 | { |
| 1521 | if (op->inv && op->randomitems) |
1521 | if (op->inv && op->randomitems) |
| 1522 | op->title = op->inv->name; |
1522 | op->title = op->inv->name; |
| 1523 | else if (op->arch) |
1523 | else if (op->arch) |
| 1524 | { |
1524 | { |
| 1525 | op->name = op->arch->clone.name; |
1525 | op->name = op->arch->object::name; |
| 1526 | op->name_pl = op->arch->clone.name_pl; |
1526 | op->name_pl = op->arch->object::name_pl; |
| 1527 | } |
1527 | } |
| 1528 | } |
1528 | } |
| 1529 | |
1529 | |
| 1530 | /* If the object is on a map, make sure we update its face */ |
1530 | /* If the object is on a map, make sure we update its face */ |
| 1531 | if (op->map) |
1531 | if (op->map) |
