| version 1.36 | | version 1.37 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_item_c = | | * static char *rcsid_item_c = |
| * "$Id: item.c,v 1.36 2003/03/08 05:35:32 mwedel Exp $"; | | * "$Id: item.c,v 1.37 2003/05/21 07:31:13 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| use_buf++; | | use_buf++; |
| use_buf %=5; | | use_buf %=5; |
| | | |
| | | #ifdef NEW_MATERIAL_CODE |
| if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname) { | | if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname) { |
| mt = name_to_material(op->materialname); | | mt = name_to_material(op->materialname); |
| if (mt) { | | if (mt) { |
| | |
| safe_strcat(buf[use_buf], " ", &len, HUGE_BUF); | | safe_strcat(buf[use_buf], " ", &len, HUGE_BUF); |
| } | | } |
| } | | } |
| | | #endif |
| | | |
| safe_strcat(buf[use_buf], query_short_name(op), &len, HUGE_BUF); | | safe_strcat(buf[use_buf], query_short_name(op), &len, HUGE_BUF); |
| | | |
| | |
| if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname) | | if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname) |
| mt = name_to_material(op->materialname); | | mt = name_to_material(op->materialname); |
| | | |
| | | #ifdef NEW_MATERIAL_CODE |
| if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname && mt && | | if ((IS_ARMOR(op) || IS_WEAPON(op)) && op->materialname && mt && |
| op->arch->clone.materialname != mt->name && | | op->arch->clone.materialname != mt->name && |
| !(op->material & M_SPECIAL)) { | | !(op->material & M_SPECIAL)) { |
| | |
| else | | else |
| safe_strcat(buf, op->name_pl, &len, MAX_BUF); | | safe_strcat(buf, op->name_pl, &len, MAX_BUF); |
| } else { | | } else { |
| | | #endif |
| if (!plural) | | if (!plural) |
| strcpy(buf, op->name); | | strcpy(buf, op->name); |
| else | | else |
| strcpy(buf, op->name_pl); | | strcpy(buf, op->name_pl); |
| len=strlen(buf); | | len=strlen(buf); |
| | | #ifdef NEW_MATERIAL_CODE |
| } | | } |
| | | #endif |
| | | |
| if (op->title && QUERY_FLAG(op,FLAG_IDENTIFIED)) { | | if (op->title && QUERY_FLAG(op,FLAG_IDENTIFIED)) { |
| safe_strcat(buf, " ", &len, MAX_BUF); | | safe_strcat(buf, " ", &len, MAX_BUF); |