| … | |
… | |
| 785 | } |
785 | } |
| 786 | else |
786 | else |
| 787 | { |
787 | { |
| 788 | #endif |
788 | #endif |
| 789 | if (!plural) |
789 | if (!plural) |
| 790 | strcpy (buf, op->name); |
790 | assign (buf, op->name); |
| 791 | else |
791 | else |
| 792 | strcpy (buf, op->name_pl); |
792 | assign (buf, op->name_pl); |
|
|
793 | |
| 793 | len = strlen (buf); |
794 | len = strlen (buf); |
| 794 | #ifdef NEW_MATERIAL_CODE |
795 | #ifdef NEW_MATERIAL_CODE |
| 795 | } |
796 | } |
| 796 | #endif |
797 | #endif |
| 797 | |
798 | |
| … | |
… | |
| 801 | safe_strcat (buf, op->title, &len, MAX_BUF); |
802 | safe_strcat (buf, op->title, &len, MAX_BUF); |
| 802 | } |
803 | } |
| 803 | |
804 | |
| 804 | switch (op->type) |
805 | switch (op->type) |
| 805 | { |
806 | { |
| 806 | case SPELLBOOK: |
807 | case SPELLBOOK: |
| 807 | case SCROLL: |
808 | case SCROLL: |
| 808 | case WAND: |
809 | case WAND: |
| 809 | case ROD: |
810 | case ROD: |
| 810 | if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) |
811 | if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) |
| 811 | { |
812 | { |
| 812 | if (!op->title) |
813 | if (!op->title) |
| 813 | { |
814 | { |
| 814 | safe_strcat (buf, " of ", &len, MAX_BUF); |
815 | safe_strcat (buf, " of ", &len, MAX_BUF); |
| 815 | if (op->inv) |
816 | if (op->inv) |
| 816 | safe_strcat (buf, op->inv->name, &len, MAX_BUF); |
817 | safe_strcat (buf, op->inv->name, &len, MAX_BUF); |
| 817 | else |
818 | else |
| 818 | LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); |
819 | LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); |
| 819 | } |
820 | } |
| 820 | if (op->type != SPELLBOOK) |
821 | if (op->type != SPELLBOOK) |
| 821 | { |
822 | { |
| 822 | sprintf (buf2, " (lvl %d)", op->level); |
823 | sprintf (buf2, " (lvl %d)", op->level); |
| 823 | safe_strcat (buf, buf2, &len, MAX_BUF); |
824 | safe_strcat (buf, buf2, &len, MAX_BUF); |
| 824 | } |
825 | } |
| 825 | } |
826 | } |
| 826 | break; |
827 | break; |
| 827 | |
828 | |
| 828 | |
829 | |
| 829 | case SKILL: |
830 | case SKILL: |
| 830 | case AMULET: |
831 | case AMULET: |
| 831 | case RING: |
832 | case RING: |
| 832 | if (!op->title) |
833 | if (!op->title) |
| 833 | { |
834 | { |
| 834 | /* If ring has a title, full description isn't so useful */ |
835 | /* If ring has a title, full description isn't so useful */ |
| 835 | char *s = ring_desc (op); |
836 | char *s = ring_desc (op); |
| 836 | |
837 | |
| 837 | if (s[0]) |
838 | if (s[0]) |
| 838 | { |
839 | { |
| 839 | safe_strcat (buf, " ", &len, MAX_BUF); |
840 | safe_strcat (buf, " ", &len, MAX_BUF); |
| 840 | safe_strcat (buf, s, &len, MAX_BUF); |
841 | safe_strcat (buf, s, &len, MAX_BUF); |
| 841 | } |
842 | } |
| 842 | } |
843 | } |
| 843 | break; |
844 | break; |
| 844 | default: |
845 | default: |
| 845 | if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) |
846 | if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) |
| 846 | { |
847 | { |
| 847 | sprintf (buf + strlen (buf), " %+d", op->magic); |
848 | sprintf (buf + strlen (buf), " %+d", op->magic); |
| 848 | } |
849 | } |
| 849 | } |
850 | } |
|
|
851 | |
| 850 | return buf; |
852 | return buf; |
| 851 | } |
853 | } |
| 852 | |
854 | |
| 853 | /* Break this off from describe_item - that function was way |
855 | /* Break this off from describe_item - that function was way |
| 854 | * too long, making it difficult to read. This function deals |
856 | * too long, making it difficult to read. This function deals |
