Changeset 652

Timestamp:

01/29/08 04:25:13 (7 months ago)

Author:

takkaria

Message:

Check in an initial version of the new, saner object_desc() code. This introduces a new file, obj-desc.c, for object description-related functions. (#430)

Files:

• trunk/src/Makefile.inc (modified) (1 diff)
• trunk/src/Makefile.src (modified) (1 diff)
• trunk/src/obj-desc.c (added)
• trunk/src/object.h (modified) (4 diffs)
• trunk/src/object1.c (modified) (5 diffs)

trunk/src/Makefile.inc

@@ -16 +16 @@
-attack.o: attack.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-birth.o: birth.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-cave.o: cave.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-compress.o: compress.c compress.h h-basic.h
-cmd0.o: cmd0.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-cmd1.o: cmd1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-cmd2.o: cmd2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-cmd3.o: cmd3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-cmd4.o: cmd4.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-cmd5.o: cmd5.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-cmd6.o: cmd6.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-cmd-obj.o: cmd-obj.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
+
+
-debug.o: debug.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-dungeon.o: dungeon.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-effects.o: effects.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-files.o: files.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h ui-menu.h 
-game-cmd.o: game-cmd.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-game-event.o: game-event.c z-virt.h h-basic.h game-event.h
-generate.o: generate.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
+
+
-init1.o: init1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-init2.o: init2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-init.h cmds.h game-event
-
+object.h init.h cmds
+event.h game-
-load.o: load.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-loadsave.o: loadsave.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-z-blockfile
-
+object
+blockfile.h z-
-melee1.o: melee1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-melee2.o: melee2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-monster1.o: monster1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-monster2.o: monster2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-object1.o: object1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-object2.o: object2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
+
+
-obj-info.o: obj-info.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
+
+
+
-option.o: option.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-randart.o: randart.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
-randname.o: randname.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-score.o: score.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-signals.o: signals.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-spells1.o: spells1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-spells2.o: spells2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-squelch.o: squelch.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
-store.o: store.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-tables.o: tables.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-trap.o: trap.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-ui.o: ui.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+ object.h
-ui-event.o: ui-event.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-ui-menu.o: ui-menu.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-util.o: util.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-variable.o: variable.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-wiz-spoil.o: wiz-spoil.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-wiz-stats.o: wiz-stats.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+object.h 
-wizard.o: wizard.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+
+
-x-spell.o: x-spell.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
+ object.h
-xtra1.o: xtra1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-xtra2.o: xtra2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-xtra3.o: xtra3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+object.h 
-z-file.o: z-file.c z-file.h h-basic.h z-virt.h z-util.h z-form.h
-z-form.o: z-form.c z-form.h h-basic.h z-type.h z-util.h z-virt.h

trunk/src/Makefile.src

@@ -80 +80 @@
-        object1.o \
-        object2.o \
+        obj-desc.o \
-        obj-info.o \
-        obj-make.o \

trunk/src/object.h

@@ -1 +1 @@
-#ifndef INCLUDED_OBJECT_H
-#define INCLUDED_OBJECT_H
+
+
+/*** Variables ***/
+
+/* object1.c */
+
+#define MAX_TITLES     50       /* Used with scrolls (min 48) */
+
+/* The titles of scrolls, by sval. */
+extern char scroll_adj[MAX_TITLES][16];
+
+
+/*** Functions ***/
-
-/* object1.c */
-void flavor_init(void);
-void reset_visuals(bool unused);
-void object_kind_name(char *buf, size_t max, int k_idx, bool easy_know);
-void object_flags(const object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3);
-void object_flags_known(const object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3);
-void object_desc(char *buf, size_t max, const object_type *o_ptr, int pref, int mode);
-void object_desc_spoil(char *buf, size_t max, const object_type *o_ptr, int pref, int mode);
-char index_to_label(int i);
-s16b label_to_inven(int c);
-s16b label_to_equip(int c);
-s16b wield_slot(const object_type *o_ptr);
-ptr 
-ptr 
+onst char *
+onst char *
-bool item_tester_okay(const object_type *o_ptr);
-int scan_floor(int *items, int max_size, int y, int x, int mode);
@@ -23 +33 @@
-void show_equip(void);
-void show_floor(const int *floor_list, int floor_num, bool gold);
-ptr 
-ptr pmt, cptr 
+onst char *
+onst char *pmt, const char *
-
-/* object2.c */
@@ -33 +43 @@
-void wipe_o_list(void);
-s16b o_pop(void);
-* 
+ *
-object_type *get_next_object(const object_type *o_ptr);
-void object_known(object_type *o_ptr);
@@ -72 +82 @@
-void reduce_charges(object_type *o_ptr, int amt);
-
+
+/*** obj-name.c ***/
+
+/**
+ * Modes for object_desc().
+ */
+enum
+{
+        ODESC_BASENAME = 0,
+        ODESC_ALL = 3,
+        ODESC_INSTORE = 4
+};
+
+/**
+ * Describes item "o_ptr" into buffer "buf" of size "max".
+ *
+ * If "prefix" is TRUE, then the name will be prefixed with a pseudo-numeric
+ * indicator of the number of items in the pile.
+ *
+ * Modes ("prefix" is TRUE):
+ *   OD_BASENAME -- Chain Mail of Death
+ *   OD_INSTORE  -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty}
+ *   OD_ALL      -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch)
+ *
+ * Modes ("prefix" is FALSE):
+ *   OD_BASENAME -- Chain Mail of Death
+ *   OD_INSTORE  -- Rings of Death [1,+3] (+2 to Stealth) {nifty}
+ *   OD_ALL      -- Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch)
+ */
+size_t object_desc(char *buf, size_t max, const object_type *o_ptr, bool prefix, int mode);
+
+/**
+ * Describes item "o_ptr" fully into buffer "buf" of size "max".
+ *
+ * This differs from object_desc() only in that it can provide information the
+ * player isn't meant to know.
+ */
+void object_desc_spoil(char *buf, size_t max, const object_type *o_ptr, int pref, int mode);
+
+/**
+ * Describe item kind "k_idx" into buffer "buf" of size "max".
+ *
+ * XXX
+ */
+void object_kind_name(char *buf, size_t max, int k_idx, bool easy_know);
+
+
-/* obj-make.c */
-void free_obj_alloc(void);

trunk/src/object1.c

@@ -20 +20 @@
-
-
-/*
- * Max sizes of the following arrays.
- */
-#define MAX_TITLES     50       /* Used with scrolls (min 48) */
-
-
-/*
- * Hold the titles of scrolls, 6 to 14 characters each.
-
-
-
-
-
+
+
-
-
@@ -372 +364 @@
-
-
-
-/*
- * Puts a very stripped-down version of an object's name into buf.
- * If easy_know is TRUE, then the IDed names are used, otherwise
- * flavours, scroll names, etc will be used.
- *
- * Just truncates if the buffer isn't big enough.
- */
-void object_kind_name(char *buf, size_t max, int k_idx, bool easy_know)
-{
-        char *t;
-
-        object_kind *k_ptr = &k_info[k_idx];
-
-        /* If not aware, use flavor */
-        if (!easy_know && !k_ptr->aware && k_ptr->flavor)
-        {
-                if (k_ptr->tval == TV_SCROLL)
-                {
-                        strnfmt(buf, max, "\"%s\"", scroll_adj[k_ptr->sval]);
-                }
-                else if (k_ptr->tval == TV_FOOD && k_ptr->sval < SV_FOOD_MIN_FOOD)
-                {
-                        strnfmt(buf, max, "%s Mushroom", flavor_text + flavor_info[k_ptr->flavor].text);
-                }
-                else
-                {
-                        /* Plain flavour (e.g. Copper) will do. */
-                        my_strcpy(buf, flavor_text + flavor_info[k_ptr->flavor].text, max);
-                }
-        }
-
-        /* Use proper name (Healing, or whatever) */
-        else
-        {
-                cptr str = (k_name + k_ptr->name);
-
-                if (k_ptr->tval == TV_FOOD && k_ptr->sval < SV_FOOD_MIN_FOOD)
-                {
-                        my_strcpy(buf, "Mushroom of ", max);
-                        max -= strlen(buf);
-                        t = buf + strlen(buf);
-                }
-                else
-                {
-                        t = buf;
-                }
-
-                /* Skip past leading characters */
-                while ((*str == ' ') || (*str == '&')) str++;
-
-                /* Copy useful chars */
-                for (; *str && max > 1; str++)
-                {
-                        /* Pluralizer for irregular plurals */
-                        /* Useful for languages where adjective changes for plural */
-                        if (*str == '|')
-                        {
-                                /* Process singular part */
-                                for (str++; *str != '|' && max > 1; str++) 
-                                {
-                                        *t++ = *str;
-                                        max--;
-                                }
-
-                                /* Process plural part */
-                                for (str++; *str != '|'; str++) ;
-                        }
-
-                        /* English plural indicator can simply be skipped */
-                        else if (*str != '~')
-                        {
-                                *t++ = *str;
-                                max--;
-                        }
-                }
-
-                /* Terminate the new name */
-                *t = '\0';
-        }
-}
-
-
-
-/*
- * Efficient version of '(T) += sprintf((T), "%c", (C))'
- */
-#define object_desc_chr_macro(T,C) do { \
- \
-        /* Copy the char */ \
-        *(T)++ = (C); \
- \
-} while (0)
-
-
-
-/*
- * Efficient version of '(T) += sprintf((T), "%s", (S))'
- */
-#define object_desc_str_macro(T,S) do { \
- \
-        cptr s = (S); \
- \
-        /* Copy the string */ \
-        while (*s) *(T)++ = *s++; \
- \
-} while (0)
-
-
-
-/*
- * Efficient version of '(T) += sprintf((T), "%u", (N))'
- */
-#define object_desc_num_macro(T,N) do { \
- \
-        int n = (N); \
- \
-        int p; \
- \
-        /* Find "size" of "n" */ \
-        for (p = 1; n >= p * 10; p = p * 10) /* loop */; \
- \
-        /* Dump each digit */ \
-        while (p >= 1) \
-        { \
-                /* Dump the digit */ \
-                *(T)++ = I2D(n / p); \
- \
-                /* Remove the digit */ \
-                n = n % p; \
- \
-                /* Process next digit */ \
-                p = p / 10; \
-        } \
- \
-} while (0)
-
-
-
-/*
- * Efficient version of '(T) += sprintf((T), "%+d", (I))'
- */
-#define object_desc_int_macro(T,I) do { \
- \
-        int i = (I); \
- \
-        /* Negative */ \
-        if (i < 0) \
-        { \
-                /* Take the absolute value */ \
-                i = 0 - i; \
- \
-                /* Use a "minus" sign */ \
-                *(T)++ = '-'; \
-        } \
- \
-        /* Positive (or zero) */ \
-        else \
-        { \
-                /* Use a "plus" sign */ \
-                *(T)++ = '+'; \
-        } \
- \
-        /* Dump the number itself */ \
-        object_desc_num_macro(T, i); \
- \
-} while (0)
-
-
-
-
-/*
- * Creates a description of the item "o_ptr", and stores it in "buf".
- *
- * One can choose the "verbosity" of the description, including whether
- * or not the "number" of items should be described, and how much detail
- * should be used when describing the item.
- *
- * The given "buf" should be at least 80 chars long to hold the longest
- * possible description, which can get pretty long, including inscriptions,
- * such as:
- * "no more Maces of Disruption (Defender) (+10,+10) [+5] (+3 to stealth)".
- *
- * Note that the object description will be clipped to fit into the given
- * buffer size.
- *
- * Note the use of "object_desc_int_macro()" and "object_desc_num_macro()"
- * and "object_desc_str_macro()" and "object_desc_chr_macro()" as extremely
- * efficient, portable, versions of some common "sprintf()" commands (without
- * the bounds checking or termination writing), which allow a pointer to
- * efficiently move through a buffer while modifying it in various ways.
- *
- * Various improper uses and/or placements of "&" or "~" characters can
- * easily induce out-of-bounds memory accesses.  Some of these could be
- * easily checked for, if efficiency was not a concern.
- *
- * Note that all ego-items (when known) append an "Ego-Item Name", unless
- * the item is also an artifact, which should never happen.
- *
- * Note that all artifacts (when known) append an "Artifact Name", so we
- * have special processing for "Specials" (artifact Lites, Rings, Amulets).
- * The "Specials" never use "modifiers" if they are "known", since they
- * have special "descriptions", such as "The Necklace of the Dwarves".
- *
- * Special Lite's use the "k_info" base-name (Phial, Star, or Arkenstone),
- * plus the artifact name, just like any other artifact, if known.
- *
- * Special Ring's and Amulet's, if not "aware", use the same code as normal
- * rings and amulets, and if "aware", use the "k_info" base-name (Ring or
- * Amulet or Necklace).  They will NEVER "append" the "k_info" name.  But,
- * they will append the artifact name, just like any artifact, if known.
- *
- * None of the Special Rings/Amulets are "EASY_KNOW", though they could be,
- * at least, those which have no "pluses", such as the three artifact lites.
- *
- * The "pluralization" rules are extremely hackish, in fact, for efficiency,
- * we only handle things like "torch"/"torches" and "cutlass"/"cutlasses",
- * and we would not handle "box"/"boxes", or "knife"/"knives", correctly.
- * Of course, it would be easy to add rules for these forms.
- *
- * If "pref" is true then a "numeric" prefix will be pre-pended, else is is
- * assumed that a string such as "The" or "Your" will be pre-pended later.
- *
- * Modes ("pref" is TRUE):
- *   0 -- Chain Mail of Death
- *   1 -- A Cloak of Death [1,+3]
- *   2 -- An Amulet of Death [1,+3] (+2 to Stealth)
- *   3 -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch)
- *   4 -- 5 Rings of Death [1,+3] (+2 to Stealth) {nifty}
- *
- * Modes ("pref" is FALSE):
- *   0 -- Chain Mail of Death
- *   1 -- Cloak of Death [1,+3]
- *   2 -- Amulet of Death [1,+3] (+2 to Stealth)
- *   3 -- Rings of Death [1,+3] (+2 to Stealth) {nifty} (squelch)
- *   4 -- Rings of Death [1,+3] (+2 to Stealth) {nifty}
- */
-void object_desc(char *buf, size_t max, const object_type *o_ptr, int pref, int mode)
-{
-        cptr basenm;
-        cptr modstr;
-
-        int power;
-
-        bool aware;
-        bool known;
-
-        bool flavor;
-
-        bool append_name;
-
-        bool show_weapon;
-        bool show_armour;
-
-        char *b;
-
-        char *t;
-
-        cptr s;
-
-        cptr u;
-        cptr v;
-
-        char p1 = '(', p2 = ')';
-        char b1 = '[', b2 = ']';
-        char c1 = '{', c2 = '}';
-
-        char tmp_buf[128];
-
-        u32b f1, f2, f3;
-
-        object_kind *k_ptr = &k_info[o_ptr->k_idx];
-
-
-        /* Extract some flags */
-        object_flags(o_ptr, &f1, &f2, &f3);
-
-
-        /* See if the object is "aware" */
-        aware = (object_aware_p(o_ptr) ? TRUE : FALSE);
-
-        /* See if the object is "known" */
-        known = (object_known_p(o_ptr) ? TRUE : FALSE);
-
-        /* See if the object is "flavored" */
-        flavor = (k_ptr->flavor ? TRUE : FALSE);
-
-        /* Allow flavors to be hidden when aware */
-        if (aware && !show_flavors) flavor = FALSE;
-
-        /* Hack -- mark-to-squelch worthless items XXX */
-        if (!k_ptr->everseen && aware && OPT(squelch_worthless))
-        {
-                if (object_value(o_ptr) == 0)
-                {
-                        k_ptr->squelch = TRUE;
-                        p_ptr->notice |= PN_SQUELCH;
-                }
-        }
-
-        /* We've seen it at least once now we're aware of it */
-        if (aware) k_ptr->everseen = TRUE;
-
-        /* Object is in the inventory of a store */
-        if (o_ptr->ident & IDENT_STORE)
-        {
-                /* Don't show flavors */
-                flavor = FALSE;
-
-                /* Pretend known and aware */
-                aware = TRUE;
-                known = TRUE;
-        }
-
-
-        /* XXX anything object_desc'd can be squelched */
-        if (aware) k_ptr->everseen = TRUE;
-
-        /* Assume no name appending */
-        append_name = FALSE;
-
-        /* Assume no need to show "weapon" bonuses */
-        show_weapon = FALSE;
-
-        /* Assume no need to show "armour" bonuses */
-        show_armour = FALSE;
-
-        /* Extract default "base" string */
-        basenm = (k_name + k_ptr->name);
-
-        /* Assume no "modifier" string */
-        modstr = "";
-
-
-        /* Analyze the object */
-        switch (o_ptr->tval)
-        {
-                /* Some objects are easy to describe */
-                case TV_SKELETON:
-                case TV_BOTTLE:
-                case TV_JUNK:
-                case TV_SPIKE:
-                case TV_FLASK:
-                case TV_CHEST:
-                {
-                        break;
-                }
-
-                /* Missiles/Bows/Weapons */
-                case TV_SHOT:
-                case TV_BOLT:
-                case TV_ARROW:
-                case TV_BOW:
-                case TV_HAFTED:
-                case TV_POLEARM:
-                case TV_SWORD:
-                case TV_DIGGING:
-                {
-                        show_weapon = TRUE;
-                        break;
-                }
-
-                /* Armour */
-                case TV_BOOTS:
-                case TV_GLOVES:
-                case TV_CLOAK:
-                case TV_CROWN:
-                case TV_HELM:
-                case TV_SHIELD:
-                case TV_SOFT_ARMOR:
-                case TV_HARD_ARMOR:
-                case TV_DRAG_ARMOR:
-                {
-                        show_armour = TRUE;
-                        break;
-                }
-
-                /* Lites (including a few "Specials") */
-                case TV_LITE:
-                {
-                        break;
-                }
-
-                /* Amulets (including a few "Specials") */
-                case TV_AMULET:
-                {
-                        /* Hack -- Known artifacts */
-                        if (artifact_p(o_ptr) && aware) break;
-
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Amulet~" : "& Amulet~");
-
-                        break;
-                }
-
-                /* Rings (including a few "Specials") */
-                case TV_RING:
-                {
-                        /* Hack -- Known artifacts */
-                        if (artifact_p(o_ptr) && aware) break;
-
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Ring~" : "& Ring~");
-
-                        break;
-                }
-
-                /* Staffs */
-                case TV_STAFF:
-                {
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Staff~" : "& Staff~");
-
-                        break;
-                }
-
-                /* Wands */
-                case TV_WAND:
-                {
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Wand~" : "& Wand~");
-
-                        break;
-                }
-
-                /* Rods */
-                case TV_ROD:
-                {
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Rod~" : "& Rod~");
-
-                        break;
-                }
-
-                /* Scrolls */
-                case TV_SCROLL:
-                {
-                        /* Color the object */
-                        modstr = scroll_adj[o_ptr->sval];
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& Scroll~ titled \"#\"" : "& Scroll~");
-
-                        break;
-                }
-
-                /* Potions */
-                case TV_POTION:
-                {
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Potion~" : "& Potion~");
-
-                        break;
-                }
-
-                /* Food */
-                case TV_FOOD:
-                {
-                        /* Ordinary food is "boring" */
-                        if (o_ptr->sval >= SV_FOOD_MIN_FOOD) break;
-
-                        /* Color the object */
-                        modstr = flavor_text + flavor_info[k_ptr->flavor].text;
-                        if (aware) append_name = TRUE;
-                        basenm = (flavor ? "& # Mushroom~" : "& Mushroom~");
-
-                        break;
-                }
-
-                /* Magic Books */
-                case TV_MAGIC_BOOK:
-                {
-                        modstr = basenm;
-                        basenm = "& Book~ of Magic Spells #";
-                        break;
-                }
-
-                /* Prayer Books */
-                case TV_PRAYER_BOOK:
-                {
-                        modstr = basenm;
-                        basenm = "& Holy Book~ of Prayers #";
-                        break;
-                }
-
-                /* Hack -- Gold/Gems */
-                case TV_GOLD:
-                {
-                        my_strcpy(buf, basenm, max);
-                        return;
-                }
-
-                /* Hack -- Default -- Used in the "inventory" routine */
-                default:
-                {
-                        my_strcpy(buf, "(nothing)", max);
-                        return;
-                }
-        }
-
-
-        /* Start dumping the result */
-        t = b = tmp_buf;
-
-        /* Begin */
-        s = basenm;
-
-        /* Handle objects which sometimes use "a" or "an" */
-        if (*s == '&')
-        {
-                /* Paranoia XXX XXX XXX */
-                /* ASSERT(s[1] == ' '); */
-
-                /* Skip the ampersand and the following space */
-                s += 2;
-
-                /* No prefix */
-                if (!pref)
-                {
-                        /* Nothing */
-                }
-
-                /* Hack -- None left */
-                else if (o_ptr->number <= 0)
-                {
-                        object_desc_str_macro(t, "no more ");
-                }
-
-                /* Extract the number */
-                else if (o_ptr->number > 1)
-                {
-                        object_desc_num_macro(t, o_ptr->number);
-                        object_desc_chr_macro(t, ' ');
-                }
-
-                /* Hack -- The only one of its kind */
-                else if (known && artifact_p(o_ptr))
-                {
-                        object_desc_str_macro(t, "The ");
-                }
-
-                /* Hack -- A single one, and next character will be a vowel */
-                else if ((*s == '#') ? is_a_vowel(modstr[0]) : is_a_vowel(*s))
-                {
-                        object_desc_str_macro(t, "an ");
-                }
-