{
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL | OD_NAME_ONLY));
/*
* If necessary, add a '^' which indicates the
if (o_ptr->tval == TV_GOLD) return -1;
/* Prepare object name string first */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
/* Convert the string to lower case */
str_tolower(o_name);
char o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
char o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Eliminate the item (from the pack) */
if (item >= 0)
char o_name[MAX_NLEN];
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
}
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(out_val, "%s¤ò½¦¤¤¤Þ¤¹¤«? ", o_name);
char o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
*o_handle = o_ptr;
string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
+ object_desc(buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
*search_strp = string_make(format("<%s>", buf));
return 1;
}
*o_handle = &autopick_last_destroyed_object;
string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
+ object_desc(buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
*search_strp = string_make(format("<%s>", buf));
return 1;
}
int i = tb->cy;
/* Prepare object name string first */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
/* Convert the string to lower case */
str_tolower(o_name);
if ((o_ptr->tval == TV_CAPTURE) && (o_ptr->pval == MON_TSUCHINOKO))
{
char buf[MAX_NLEN+20];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s ¤ò´¹¶â¤·¤Þ¤¹¤«¡©",o_name);
#else
if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_CORPSE) && (o_ptr->pval == MON_TSUCHINOKO))
{
char buf[MAX_NLEN+20];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s ¤ò´¹¶â¤·¤Þ¤¹¤«¡©",o_name);
#else
if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_SKELETON) && (o_ptr->pval == MON_TSUCHINOKO))
{
char buf[MAX_NLEN+20];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s ¤ò´¹¶â¤·¤Þ¤¹¤«¡©",o_name);
#else
if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_CORPSE) && (streq(r_name + r_info[o_ptr->pval].name, r_name + r_info[today_mon].name)))
{
char buf[MAX_NLEN+20];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s ¤ò´¹¶â¤·¤Þ¤¹¤«¡©",o_name);
#else
if ((o_ptr->tval == TV_CORPSE) && (o_ptr->sval == SV_SKELETON) && (streq(r_name + r_info[o_ptr->pval].name, r_name + r_info[today_mon].name)))
{
char buf[MAX_NLEN+20];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s ¤ò´¹¶â¤·¤Þ¤¹¤«¡©",o_name);
#else
int num, k;
object_type forge;
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
sprintf(buf, "%s¤òÅϤ·¤Þ¤¹¤«¡©",o_name);
#else
(void)inven_carry(&forge);
/* Describe the object */
- object_desc(o_name, &forge, TRUE, 3);
+ object_desc(o_name, &forge, 0);
#ifdef JP
msg_format("%s ¤òÌã¤Ã¤¿¡£",o_name);
#else
int eff_ds = o_ptr->ds + p_ptr->to_ds[0];
/* Print the weapon name */
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
c_put_str(TERM_YELLOW, o_name, row, col);
/* Print the player's number of blows */
/* Check if the player has enough money */
if (p_ptr->au < (cost * o_ptr->number))
{
- object_desc(tmp_str, o_ptr, TRUE, 0);
+ object_desc(tmp_str, o_ptr, OD_NAME_ONLY);
#ifdef JP
msg_format("%s¤ò²þÎɤ¹¤ë¤À¤±¤Î¥´¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡ª", tmp_str);
#else
}
else
{
- object_desc(tmp_str, o_ptr, TRUE, 1);
+ object_desc(tmp_str, o_ptr, OD_NAME_AND_ENCHANT);
#ifdef JP
msg_format("¡ð%d ¤Ç%s¤ò²þÎɤ·¤Þ¤·¤¿¡£", cost * o_ptr->number, tmp_str );
#else
identify_item(o_ptr);
/* Description */
- object_desc(tmp_str, o_ptr, TRUE, 3);
+ object_desc(tmp_str, o_ptr, 0);
#ifdef JP
msg_format("%s ¤Ç¤¹¡£", tmp_str);
/* Check if the player has enough money */
if (p_ptr->au < price)
{
- object_desc(tmp_str, o_ptr, TRUE, 0);
+ object_desc(tmp_str, o_ptr, OD_NAME_ONLY);
#ifdef JP
msg_format("%s¤òºÆ½¼Å¶¤¹¤ë¤Ë¤Ï¡ð%d ɬÍפǤ¹¡ª", tmp_str,price );
#else
}
/* Give feedback */
- object_desc(tmp_str, o_ptr, TRUE, 3);
+ object_desc(tmp_str, o_ptr, 0);
#ifdef JP
msg_format("%s¤ò¡ð%d ¤ÇºÆ½¼Å¶¤·¤Þ¤·¤¿¡£", tmp_str, price);
#else
int len = 0;
byte attr;
- object_desc(buf, o_ptr, FALSE, 0);
+ object_desc(buf, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
attr = tval_to_attr[o_ptr->tval % 128];
if (p_ptr->image)
#ifdef JP
/* Describe the object */
- object_desc(old_name, o_ptr, TRUE, 0);
+ object_desc(old_name, o_ptr, OD_NAME_ONLY);
object_desc_kosuu(kazu_str, o_ptr);
hirottakazu = o_ptr->number;
#endif
}
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
#endif /* ALLOW_EASY_SENSE -- TNB */
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
object_type *q_ptr = &o_list[m_ptr->hold_o_idx];
char o_name[MAX_NLEN];
- object_desc(o_name, q_ptr, TRUE, 0);
+ object_desc(o_name, q_ptr, OD_NAME_ONLY);
q_ptr->held_m_idx = 0;
q_ptr->marked = 0;
m_ptr->hold_o_idx = q_ptr->next_o_idx;
}
/* Describe the object */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
/* Use the proper number of shots */
q_ptr->number = 1;
/* Description */
- object_desc(o_name, q_ptr, FALSE, 3);
+ object_desc(o_name, q_ptr, OD_OMIT_PREFIX);
if (p_ptr->mighty_throw) mult += 3;
j = -1;
if (boomerang) back_chance += 4+randint1(5);
if (super_boomerang) back_chance += 100;
- object_desc(o2_name, q_ptr, FALSE, 0);
+ object_desc(o2_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
if((back_chance > 30) && (!one_in_(100) || super_boomerang))
{
object_type *otmp_ptr = &object_tmp;
char ol_name[MAX_NLEN];
- object_desc(ol_name, ol_ptr, FALSE, 0);
+ object_desc(ol_name, ol_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
object_copy(otmp_ptr, ol_ptr);
object_copy(ol_ptr, or_ptr);
if (cursed_p(&inventory[slot]))
{
/* Describe it */
- object_desc(o_name, &inventory[slot], FALSE, 0);
+ object_desc(o_name, &inventory[slot], (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Message */
#ifdef JP
char dummy[MAX_NLEN+80];
/* Describe it */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
sprintf(dummy, "ËÜÅö¤Ë%s{¼ö¤ï¤ì¤Æ¤¤¤ë}¤ò»È¤¤¤Þ¤¹¤«¡©", o_name);
char dummy[MAX_NLEN+80];
/* Describe it */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
sprintf(dummy, "%s¤òÁõÈ÷¤¹¤ë¤ÈµÛ·ìµ´¤Ë¤Ê¤ê¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©", o_name);
}
/* Describe the result */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
msg_format(act, o_name, index_to_label(slot));
p_ptr->total_weight += o2_ptr->weight;
inven_item_increase(INVEN_LARM,-1);
inven_item_optimize(INVEN_LARM);
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
if (((o_ptr->weight > 99) || (o_ptr->tval == TV_POLEARM)) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
#ifdef JP
msg_format("%s¤òξ¼ê¤Ç¹½¤¨¤¿¡£", o_name );
if (buki_motteruka(INVEN_RARM))
{
o_ptr = &inventory[INVEN_RARM];
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
if (((o_ptr->weight > 99) || (o_ptr->tval == TV_POLEARM)) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
#ifdef JP
msg_format("%s¤òξ¼ê¤Ç¹½¤¨¤¿¡£", o_name );
p_ptr->total_weight += o2_ptr->weight;
inven_item_increase(INVEN_RARM,-1);
inven_item_optimize(INVEN_RARM);
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
#ifdef JP
msg_format("%s¤ò»ý¤ÁÂؤ¨¤¿¡£", o_name);
#else
/* Describe the object */
old_number = o_ptr->number;
o_ptr->number = amt;
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
o_ptr->number = old_number;
/* Verify unless quantity given */
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe */
#ifdef JP
}
/* Describe the activity */
- object_desc(o_name, o_ptr, TRUE, 2);
+ object_desc(o_name, o_ptr, OD_OMIT_INSCRIPTION);
/* Message */
#ifdef JP
|| o_ptr->art_name || o_ptr->name1)
{
int i = 0;
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
while (o_name[i] && (i < 26))
{
/* Make it an artifact */
q_ptr->name1 = (byte)who[k];
+ /* Display as if known */
+ q_ptr->ident |= IDENT_STORE;
+
/* Describe the artifact */
- object_desc_store(base_name, q_ptr, FALSE, 0);
+ object_desc(base_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
}
/* Hack -- Build the artifact name */
{
#ifdef JP
if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
- object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
+ object_desc(o_name, &st_ptr->stock[i], 0);
if (strlen(o_name) <= 80-3)
{
fprintf(fff, "%c%s %s\n", I2A(i%12), paren, o_name);
fprintf(fff, " %.77s\n", o_name+n);
}
#else
- object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
+ object_desc(o_name, &st_ptr->stock[i], 0);
fprintf(fff, "%c%s %s\n", I2A(i%12), paren, o_name);
#endif
/* Drain vitality of humanoids */
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤Ïdz¤¨¾å¤ê³¥¤Ë¤Ê¤Ã¤¿¡£ÀºÎϤòµÛ¼ý¤·¤¿µ¤¤¬¤¹¤ë¡£", o_name);
q=format("book-%d_jp.txt",o_ptr->sval);
/* Display object description */
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
/* Build the filename */
path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, q);
#define MD_TRUE_NAME 0x00000100 /* Chameleon's true name */
#define MD_IGNORE_HALLU 0x00000200 /* Ignore hallucination, and penetrate shape change */
+
+/*
+ * Bit flags for object_desc()
+ */
+#define OD_NAME_ONLY 0x00000001 /* Omit values, pval, inscription */
+#define OD_NAME_AND_ENCHANT 0x00000002 /* Omit pval, inscription */
+#define OD_OMIT_INSCRIPTION 0x00000004 /* Omit inscription */
+#define OD_OMIT_PREFIX 0x00000008 /* Omit numeric prefix */
+#define OD_NO_PLURAL 0x00000010 /* Don't use plural */
+#define OD_STORE 0x00000020 /* Assume to be aware and known */
+#define OD_NO_FLAVOR 0x00000040 /* Allow to hidden flavor */
+
+
/*
* Bit flags for the "p_ptr->special_attack" variable. -LM-
*
#define IDENT_FIXED 0x02 /* Item has been "haggled" */
#define IDENT_EMPTY 0x04 /* Item charges are known */
#define IDENT_KNOWN 0x08 /* Item abilities are known */
-#define IDENT_STOREB 0x10 /* Item is storebought !!!! */
+#define IDENT_STORE 0x10 /* Item is storebought !!!! */
#define IDENT_MENTAL 0x20 /* Item information is known */
#if 0
#define IDENT_CURSED 0x40 /* Item is temporarily cursed */
if (disturb_minor) disturb(0, 0);
/* Get an object description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Message (equipment) */
if (slot >= INVEN_RARM)
feel = value_check_aux1(o_ptr);
/* Get an object description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Skip non-feelings */
if (!feel)
if (s[1] == '!')
{
/* Describe (briefly) */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Notify the player */
#ifdef JP
char ouch [MAX_NLEN+40];
/* Get an object description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤¬¤¢¤Ê¤¿¤Î¥¢¥ó¥Ç¥Ã¥É¤ÎÆùÂΤò¾Æ¤¾Ç¤¬¤·¤¿¡ª", o_name);
cave_no_regen = TRUE;
/* Get an object description */
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
#ifdef JP
sprintf(ouch, "%s¤òÁõÈ÷¤·¤¿¥À¥á¡¼¥¸", o_name);
{
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
o_ptr->curse_flags |= new_curse;
#ifdef JP
{
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
o_ptr->curse_flags |= new_curse;
#ifdef JP
{
char o_name[MAX_NLEN];
- object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), FALSE, 0);
+ object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤¬Æ°Êª¤ò°ú¤´ó¤»¤¿¡ª", o_name);
#else
{
char o_name[MAX_NLEN];
- object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), FALSE, 0);
+ object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤¬°Ëâ¤ò°ú¤´ó¤»¤¿¡ª", o_name);
#else
{
char o_name[MAX_NLEN];
- object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), FALSE, 0);
+ object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤¬¥É¥é¥´¥ó¤ò°ú¤´ó¤»¤¿¡ª", o_name);
#else
{
char o_name[MAX_NLEN];
- object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_HP), FALSE, 0);
+ object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_HP), (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤Ï¤¢¤Ê¤¿¤ÎÂÎÎϤòµÛ¼ý¤·¤¿¡ª", o_name);
#else
{
char o_name[MAX_NLEN];
- object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_MANA), FALSE, 0);
+ object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_MANA), (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤Ï¤¢¤Ê¤¿¤ÎËâÎϤòµÛ¼ý¤·¤¿¡ª", o_name);
#else
/* Describe */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
extern void get_table_name(char *out_string);
extern void flavor_init(void);
extern char *object_desc_kosuu(char *t, object_type *o_ptr);
-extern void object_desc(char *buf, object_type *o_ptr, int pref, int mode);
+extern void object_desc(char *buf, object_type *o_ptr, u32b mode);
/* floors.c */
extern void init_saved_floors(bool force);
extern void reset_visuals(void);
extern void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
extern void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
-extern void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode);
extern cptr item_activation(object_type *o_ptr);
extern bool screen_object(object_type *o_ptr, bool real);
extern char index_to_label(int i);
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
- object_desc(o_name, &inventory[i], TRUE, 3);
+ object_desc(o_name, &inventory[i], 0);
if ((i == INVEN_LARM) && p_ptr->ryoute)
#ifdef JP
strcpy(o_name, "(Éð´ï¤òξ¼ê»ý¤Á)");
if (!inventory[i].k_idx) break;
/* Dump the inventory slots */
- object_desc(o_name, &inventory[i], TRUE, 3);
+ object_desc(o_name, &inventory[i], 0);
fprintf(fff, "%c) %s\n", index_to_label(i), o_name);
}
#else
fprintf(fff, "\n ( page %d )\n", x++);
#endif
- object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
+ object_desc(o_name, &st_ptr->stock[i], 0);
fprintf(fff, "%c) %s\n", I2A(i%12), o_name);
}
{
#ifdef JP
if ((i % 12) == 0) fprintf(fff, "\n ( %d ¥Ú¡¼¥¸ )\n", x++);
- object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
+ object_desc(o_name, &st_ptr->stock[i], 0);
fprintf(fff, "%c) %s\n", I2A(i%12), o_name);
#else
if ((i % 12) == 0) fprintf(fff, "\n ( page %d )\n", x++);
- object_desc(o_name, &st_ptr->stock[i], TRUE, 3);
+ object_desc(o_name, &st_ptr->stock[i], 0);
fprintf(fff, "%c) %s\n", I2A(i%12), o_name);
#endif
prt(tmp_val, j+2, 4);
/* Display object description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
c_put_str(tval_to_attr[o_ptr->tval], o_name, j+2, 7);
}
*
* Hack -- Display "The One Ring" as "a Plain Gold Ring" until aware.
*
- * If "pref" then a "numeric" prefix will be pre-pended.
- *
* Mode:
- * 0 -- The Cloak of Death
- * 1 -- The Cloak of Death [1,+3]
- * 2 -- The Cloak of Death [1,+3] (+2 to Stealth)
- * 3 -- The Cloak of Death [1,+3] (+2 to Stealth) {nifty}
+ * OD_NAME_ONLY : The Cloak of Death
+ * OD_NAME_AND_ENCHANT : The Cloak of Death [1,+3]
+ * OD_OMIT_INSCRIPTION : The Cloak of Death [1,+3] (+2 to Stealth)
+ * 0 : The Cloak of Death [1,+3] (+2 to Stealth) {nifty}
+ *
+ * OD_OMIT_PREFIX : Forbidden numeric prefix
+ * OD_NO_PLURAL : Forbidden use of plural
+ * OD_STORE : Assume to be aware and known
+ * OD_NO_FLAVOR : Allow to hidden flavor
*/
-void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
+void object_desc(char *buf, object_type *o_ptr, u32b mode)
{
+ /* Extract object kind name */
+ cptr kindname = get_object_name(o_ptr);
+
/* Extract default "base" string */
- cptr basenm = get_object_name(o_ptr);
+ cptr basenm = kindname;
/* Assume no "modifier" string */
cptr modstr = "";
/* Hack -- Extract the sub-type "indexx" */
int indexx = o_ptr->sval;
- int power, i;
+ int power;
bool aware = FALSE;
bool known = FALSE;
-
-#ifndef JP
- bool append_name = FALSE;
-#endif
+ bool flavor = TRUE;
bool show_weapon = FALSE;
bool show_armour = FALSE;
- cptr s, u;
+ cptr s;
char *t;
char p1 = '(', p2 = ')';
char tmp_val[MAX_NLEN+160];
char tmp_val2[MAX_NLEN+10];
- char insc_buf[1024];
+ char fake_insc_buf[30];
u32b flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
/* See if the object is "aware" */
- if (object_aware_p(o_ptr) || (o_ptr->ident & IDENT_MENTAL)) aware = TRUE;
+ if (object_aware_p(o_ptr)) aware = TRUE;
/* See if the object is "known" */
if (object_known_p(o_ptr)) known = TRUE;
+ /* Allow flavors to be hidden when aware */
+ if (aware && ((mode & OD_NO_FLAVOR) || plain_descriptions)) flavor = FALSE;
+
+ /* Object is in the inventory of a store or spoiler */
+ if ((mode & OD_STORE) || (o_ptr->ident & IDENT_STORE))
+ {
+ /* Don't show flavors */
+ flavor = FALSE;
+
+ /* Pretend known and aware */
+ aware = TRUE;
+ known = TRUE;
+ }
/* Analyze the object */
switch (o_ptr->tval)
modstr = r_name + r_ptr->name;
-
#ifdef JP
- sprintf(tmp_val2, "#%s", basenm);
+ basenm = "#%";
#else
if (r_ptr->flags1 & RF1_UNIQUE)
- {
- sprintf(tmp_val2, "& %s %s", basenm, "of #");
- }
+ basenm = "& % of #";
else
- {
- sprintf(tmp_val2, "& # %s", basenm);
- }
+ basenm = "& # %";
#endif
-
- basenm = tmp_val2;
break;
}
/* Color the object */
modstr = amulet_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "¥¢¥ß¥å¥ì¥Ã¥È";
- else
- basenm = aware ? "#%¤Î¥¢¥ß¥å¥ì¥Ã¥È" : "#¥¢¥ß¥å¥ì¥Ã¥È";
+ if (!flavor) basenm = "%¤Î¥¢¥ß¥å¥ì¥Ã¥È";
+ else if (aware) basenm = "%¤Î#¥¢¥ß¥å¥ì¥Ã¥È";
+ else basenm = "#¥¢¥ß¥å¥ì¥Ã¥È";
#else
- basenm = "& Amulet~";
- else
- basenm = aware ? "& # Amulet~" : "& # Amulet~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Amulet~ of %";
+ else if (aware) basenm = "& # Amulet~ of %";
+ else basenm = "& # Amulet~";
#endif
break;
/* Color the object */
modstr = ring_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤Î»ØÎØ" : "»ØÎØ";
- else
- basenm = aware ? "#%¤Î»ØÎØ" : "#»ØÎØ";
+ if (!flavor) basenm = "%¤Î»ØÎØ";
+ else if (aware) basenm = "%¤Î#»ØÎØ";
+ else basenm = "#»ØÎØ";
#else
- basenm = "& Ring~";
- else
- basenm = aware ? "& # Ring~" : "& # Ring~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Ring~ of %";
+ else if (aware) basenm = "& # Ring~ of %";
+ else basenm = "& # Ring~";
#endif
if (!k_ptr->to_h && !k_ptr->to_d && (o_ptr->to_h || o_ptr->to_d)) show_weapon = TRUE;
/* Color the object */
modstr = staff_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤Î¾ó" : "¾ó";
- else
- basenm = aware ? "#%¤Î¾ó" : "#¾ó";
+ if (!flavor) basenm = "%¤Î¾ó";
+ else if (aware) basenm = "%¤Î#¾ó";
+ else basenm = "#¾ó";
#else
- basenm = "& Staff~";
- else
- basenm = aware ? "& # Staff~" : "& # Staff~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Staff~ of %";
+ else if (aware) basenm = "& # Staff~ of %";
+ else basenm = "& # Staff~";
#endif
break;
/* Color the object */
modstr = wand_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware? "%¤ÎËâË¡ËÀ":"ËâË¡ËÀ";
- else
- basenm = aware ? "#%¤ÎËâË¡ËÀ" : "#ËâË¡ËÀ";
+ if (!flavor) basenm = "%¤ÎËâË¡ËÀ";
+ else if (aware) basenm = "%¤Î#ËâË¡ËÀ";
+ else basenm = "#ËâË¡ËÀ";
#else
- basenm = "& Wand~";
- else
- basenm = aware ? "& # Wand~" : "& # Wand~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Wand~ of %";
+ else if (aware) basenm = "& # Wand~ of %";
+ else basenm = "& # Wand~";
#endif
break;
/* Color the object */
modstr = rod_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware? "%¤Î¥í¥Ã¥É":"¥í¥Ã¥É";
- else
- basenm = aware ? "#%¤Î¥í¥Ã¥É" : "#¥í¥Ã¥É";
+ if (!flavor) basenm = "%¤Î¥í¥Ã¥É";
+ else if (aware) basenm = "%¤Î#¥í¥Ã¥É";
+ else basenm = "#¥í¥Ã¥É";
#else
- basenm = "& Rod~";
- else
- basenm = aware ? "& # Rod~" : "& # Rod~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Rod~ of %";
+ else if (aware) basenm = "& # Rod~ of %";
+ else basenm = "& # Rod~";
#endif
break;
/* Color the object */
modstr = scroll_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤Î´¬Êª" : "´¬Êª";
- else
- basenm = aware ? "¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª" : "¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª";
+ if (!flavor) basenm = "%¤Î´¬Êª";
+ else if (aware) basenm = "¡Ö#¡×¤È½ñ¤«¤ì¤¿%¤Î´¬Êª";
+ else basenm = "¡Ö#¡×¤È½ñ¤«¤ì¤¿´¬Êª";
#else
- basenm = "& Scroll~";
- else
- basenm = aware ? "& Scroll~ titled \"#\"" : "& Scroll~ titled \"#\"";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Scroll~ of %";
+ else if (aware) basenm = "& Scroll~ titled \"#\" of %";
+ else basenm = "& Scroll~ titled \"#\"";
#endif
break;
/* Color the object */
modstr = potion_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤ÎÌô" : "Ìô";
- else
- basenm = aware ? "#%¤ÎÌô" : "#Ìô";
+ if (!flavor) basenm = "%¤ÎÌô";
+ else if (aware) basenm = "%¤Î#Ìô";
+ else basenm = "#Ìô";
#else
- basenm = "& Potion~";
- else
- basenm = aware ? "& # Potion~" : "& # Potion~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Potion~ of %";
+ else if (aware) basenm = "& # Potion~ of %";
+ else basenm = "& # Potion~";
#endif
break;
/* Color the object */
modstr = food_adj[indexx];
- if ((plain_descriptions && aware) || (o_ptr->ident & IDENT_STOREB))
#ifdef JP
- basenm = aware ? "%¤Î¥¥Î¥³" : "¥¥Î¥³";
- else
- basenm = aware ? "#%¤Î¥¥Î¥³" : "#¥¥Î¥³";
+ if (!flavor) basenm = "%¤Î¥¥Î¥³";
+ else if (aware) basenm = "%¤Î#¥¥Î¥³";
+ else basenm = "#¥¥Î¥³";
#else
- basenm = "& Mushroom~";
- else
- basenm = aware ? "& # Mushroom~" : "& # Mushroom~";
-
- if (aware) append_name = TRUE;
+ if (!flavor) basenm = "& Mushroom~ of %";
+ else if (aware) basenm = "& # Mushroom~ of %";
+ else basenm = "& # Mushroom~";
#endif
break;
case TV_PARCHMENT:
{
- modstr = basenm;
#ifdef JP
- basenm = "ÍÓÈé»æ - #";
+ basenm = "ÍÓÈé»æ - %";
#else
- basenm = "& Parchment~ - #";
+ basenm = "& Parchment~ - %";
#endif
break;
}
/* Magic Books */
case TV_LIFE_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "À¸Ì¿¤ÎËâË¡½ñ#";
+ basenm = "À¸Ì¿¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Life Magic #";
+ basenm = "& Book~ of Life Magic %";
else
- basenm = "& Life Spellbook~ #";
+ basenm = "& Life Spellbook~ %";
#endif
break;
case TV_SORCERY_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "Àç½Ñ¤ÎËâË¡½ñ#";
+ basenm = "Àç½Ñ¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Sorcery #";
+ basenm = "& Book~ of Sorcery %";
else
- basenm = "& Sorcery Spellbook~ #";
+ basenm = "& Sorcery Spellbook~ %";
#endif
break;
case TV_NATURE_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "¼«Á³¤ÎËâË¡½ñ#";
+ basenm = "¼«Á³¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Nature Magic #";
+ basenm = "& Book~ of Nature Magic %";
else
- basenm = "& Nature Spellbook~ #";
+ basenm = "& Nature Spellbook~ %";
#endif
break;
case TV_CHAOS_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ#";
+ basenm = "¥«¥ª¥¹¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Chaos Magic #";
+ basenm = "& Book~ of Chaos Magic %";
else
- basenm = "& Chaos Spellbook~ #";
+ basenm = "& Chaos Spellbook~ %";
#endif
break;
case TV_DEATH_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "°Å¹õ¤ÎËâË¡½ñ#";
+ basenm = "°Å¹õ¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Death Magic #";
+ basenm = "& Book~ of Death Magic %";
else
- basenm = "& Death Spellbook~ #";
+ basenm = "& Death Spellbook~ %";
#endif
break;
case TV_TRUMP_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ#";
+ basenm = "¥È¥é¥ó¥×¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Trump Magic #";
+ basenm = "& Book~ of Trump Magic %";
else
- basenm = "& Trump Spellbook~ #";
+ basenm = "& Trump Spellbook~ %";
#endif
break;
case TV_ARCANE_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "Èë½Ñ¤ÎËâË¡½ñ#";
+ basenm = "Èë½Ñ¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Arcane Magic #";
+ basenm = "& Book~ of Arcane Magic %";
else
- basenm = "& Arcane Spellbook~ #";
+ basenm = "& Arcane Spellbook~ %";
#endif
break;
case TV_ENCHANT_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "¾¢¤ÎËâË¡½ñ#";
+ basenm = "¾¢¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Craft Magic #";
+ basenm = "& Book~ of Craft Magic %";
else
- basenm = "& Craft Spellbook~ #";
+ basenm = "& Craft Spellbook~ %";
#endif
break;
case TV_DAEMON_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "°Ëâ¤ÎËâË¡½ñ#";
+ basenm = "°Ëâ¤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Daemon Magic #";
+ basenm = "& Book~ of Daemon Magic %";
else
- basenm = "& Daemon Spellbook~ #";
+ basenm = "& Daemon Spellbook~ %";
#endif
break;
case TV_CRUSADE_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "Ç˼٤ÎËâË¡½ñ#";
+ basenm = "Ç˼٤ÎËâË¡½ñ%";
#else
if (mp_ptr->spell_book == TV_LIFE_BOOK)
- basenm = "& Book~ of Crusade Magic #";
+ basenm = "& Book~ of Crusade Magic %";
else
- basenm = "& Crusade Spellbook~ #";
+ basenm = "& Crusade Spellbook~ %";
#endif
break;
case TV_MUSIC_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "²Î½¸#";
+ basenm = "²Î½¸%";
#else
- basenm = "& Song Book~ #";
+ basenm = "& Song Book~ %";
#endif
break;
case TV_HISSATSU_BOOK:
{
- modstr = basenm;
#ifdef JP
- basenm = "& Éð·Ý¤Î½ñ#";
+ basenm = "& Éð·Ý¤Î½ñ%";
#else
- basenm = "Book~ of Kendo #";
+ basenm = "Book~ of Kendo %";
#endif
break;
if (aware && have_flag(flgs, TR_FULL_NAME))
{
if (known && o_ptr->name1) basenm = a_name + a_info[o_ptr->name1].name;
- else basenm = get_object_name(o_ptr);
-#ifndef JP
- append_name = FALSE;
-#endif
+ else basenm = kindname;
}
/* Start dumping the result */
s = basenm;
/* No prefix */
- if (!pref)
+ if (mode & OD_OMIT_PREFIX)
{
/* Nothing */
}
s = basenm + 2;
/* No prefix */
- if (!pref)
+ if (mode & OD_OMIT_PREFIX)
{
/* Nothing */
}
}
}
- /* A single one, with a vowel in the modifier */
- else if ((*s == '#') && (is_a_vowel(modstr[0])))
+ /* A single one */
+ else
{
- t = object_desc_str(t, "an ");
- }
+ bool vowel;
- /* A single one, with a vowel */
- else if (is_a_vowel(*s))
- {
- t = object_desc_str(t, "an ");
- }
+ switch (*s)
+ {
+ case '#': vowel = is_a_vowel(modstr[0]); break;
+ case '%': vowel = is_a_vowel(*kindname); break;
+ default: vowel = is_a_vowel(*s); break;
+ }
- /* A single one, without a vowel */
- else
- {
- t = object_desc_str(t, "a ");
+ if (vowel)
+ {
+ /* A single one, with a vowel */
+ t = object_desc_str(t, "an ");
+ }
+ else
+ {
+ /* A single one, without a vowel */
+ t = object_desc_str(t, "a ");
+ }
}
}
s = basenm;
/* No pref */
- if (!pref)
+ if (mode & OD_OMIT_PREFIX)
{
/* Nothing */
}
/* ¥é¥ó¥À¥à¡¦¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È */
if (o_ptr->art_name)
{
- char temp[256];
- strcpy(temp, quark_str(o_ptr->art_name));
+ cptr temp = quark_str(o_ptr->art_name);
+
/* '¡Ø' ¤«¤é»Ï¤Þ¤é¤Ê¤¤ÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ½é¤ËÉղ乤ë */
/* ±Ñ¸ìÈǤΥ»¡¼¥Ö¥Õ¥¡¥¤¥ë¤«¤éÍ褿 'of XXX' ¤Ï,¡ÖXXX¤Î¡×¤Èɽ¼¨¤¹¤ë */
if (strncmp(temp, "of ", 3) == 0)
}
}
#endif
+
/* Copy the string */
for (; *s; s++)
{
- /* Pluralizer */
-#ifdef JP
+ /* Insert the modifier (flavor) */
if (*s == '#')
-#else
- if (*s == '~')
+ {
+ t = object_desc_str(t, modstr);
+
+ /* Paranoia -- Never append multiple modstr's */
+ modstr = "";
+ }
+
+ /* Append kind name */
+ else if (*s == '%')
+ {
+ t = object_desc_str(t, kindname);
+
+ /* Paranoia -- Never append multiple kindname's */
+ kindname = "";
+ }
+
+#ifndef JP
+ /* Pluralizer */
+ else if (*s == '~')
{
/* Add a plural if needed */
- if (pref && (o_ptr->number != 1))
+ if (!(mode & OD_NO_PLURAL) && (o_ptr->number != 1))
{
char k = t[-1];
*t++ = 's';
}
}
-
- /* Modifier */
- else if (*s == '#')
#endif
- {
- /* Insert the modifier */
- for (u = modstr; *u; u++) *t++ = *u;
- }
-#ifdef JP
- else if (*s == '%')
- /* saigo ¤ÎÂå¤ï¤ê¡£¸úǽ¤òÉղ乤ë by ita */
- {
- modstr = get_object_name(o_ptr);
- for (u = modstr; *u; u++) *t++ = *u;
- }
-#endif
/* Normal */
else
{
*t = '\0';
- /* Append the "kind name" to the "base name" */
-#ifndef JP
- if (append_name)
- {
- t = object_desc_str(t, " of ");
- t = object_desc_str(t, get_object_name(o_ptr));
- }
-#endif
-
-
#ifdef JP
/* '¡Ø'¤«¤é»Ï¤Þ¤ëÅÁÀâ¤Î¥¢¥¤¥Æ¥à¤Î̾Á°¤ÏºÇ¸å¤ËÉղ乤ë */
if (known)
/* No more details wanted */
- if (mode < 1) goto copyback;
+ if (mode & OD_NAME_ONLY) goto object_desc_done;
/* Hack -- Chests must be described in detail */
if (o_ptr->tval == TV_CHEST)
/* No more details wanted */
- if (mode < 2) goto copyback;
+ if (mode & OD_NAME_AND_ENCHANT) goto object_desc_done;
if (known) /* Known item only */
/* No more details wanted */
- if (mode < 3) goto copyback;
+ if (mode & OD_OMIT_INSCRIPTION) goto object_desc_done;
- /* No inscription yet */
+ /* Prepare real inscriptions in a buffer */
tmp_val2[0] = '\0';
+ /* Auto abbreviation inscribe */
+ if ((abbrev_extra || abbrev_all) && (o_ptr->ident & IDENT_MENTAL))
+ {
+ if (!o_ptr->inscription || !my_strchr(quark_str(o_ptr->inscription), '%'))
+ {
+ bool kanji, all;
+
+#ifdef JP
+ kanji = TRUE;
+#else
+ kanji = FALSE;
+#endif
+ all = abbrev_all;
+
+ get_ability_abbreviation(tmp_val2, o_ptr, kanji, all);
+ }
+ }
+
+ /* Use the standard inscription if available */
+ if (o_ptr->inscription)
+ {
+ char buff[1024];
+
+ if (tmp_val2[0]) strcat(tmp_val2, ", ");
+
+ /* Get inscription and convert {%} */
+ get_inscription(buff, o_ptr);
+
+ /* strcat with correct treating of kanji */
+ my_strcat(tmp_val2, buff, sizeof(tmp_val2));
+ }
+
+
+ /* No fake inscription yet */
+ fake_insc_buf[0] = '\0';
+
/* Use the game-generated "feeling" otherwise, if available */
if (o_ptr->feeling)
{
- strcpy(tmp_val2, game_inscriptions[o_ptr->feeling]);
+ strcpy(fake_insc_buf, game_inscriptions[o_ptr->feeling]);
}
/* Note "cursed" if the item is known to be cursed */
else if (cursed_p(o_ptr) && (known || (o_ptr->ident & IDENT_SENSE)))
{
#ifdef JP
- strcpy(tmp_val2, "¼ö¤ï¤ì¤Æ¤¤¤ë");
+ strcpy(fake_insc_buf, "¼ö¤ï¤ì¤Æ¤¤¤ë");
#else
- strcpy(tmp_val2, "cursed");
+ strcpy(fake_insc_buf, "cursed");
#endif
}
/* Note "unidentified" if the item is unidentified */
else if (((o_ptr->tval == TV_RING) || (o_ptr->tval == TV_AMULET)
|| (o_ptr->tval == TV_LITE) || (o_ptr->tval == TV_FIGURINE))
- && object_aware_p(o_ptr) && !known
+ && aware && !known
&& !(o_ptr->ident & IDENT_SENSE))
{
#ifdef JP
- strcpy(tmp_val2, "̤´ÕÄê");
+ strcpy(fake_insc_buf, "̤´ÕÄê");
#else
- strcpy(tmp_val2, "unidentified");
+ strcpy(fake_insc_buf, "unidentified");
#endif
}
else if (!known && (o_ptr->ident & IDENT_EMPTY))
{
#ifdef JP
- strcpy(tmp_val2, "¶õ");
+ strcpy(fake_insc_buf, "¶õ");
#else
- strcpy(tmp_val2, "empty");
+ strcpy(fake_insc_buf, "empty");
#endif
}
else if (!aware && object_tried_p(o_ptr))
{
#ifdef JP
- strcpy(tmp_val2, "̤ȽÌÀ");
+ strcpy(fake_insc_buf, "̤ȽÌÀ");
#else
- strcpy(tmp_val2, "tried");
+ strcpy(fake_insc_buf, "tried");
#endif
}
- /* Init inscription buffer */
- insc_buf[0] = '\0';
-
- /* Auto abbreviation inscribe */
- if ((abbrev_extra || abbrev_all) && (o_ptr->ident & IDENT_MENTAL))
+ /* Note the discount, if any */
+ if (o_ptr->discount)
{
- if (!o_ptr->inscription || !my_strchr(quark_str(o_ptr->inscription), '%'))
+ /* Hidden by real inscription unless in a store */
+ if (!tmp_val2[0] || (o_ptr->ident & IDENT_STORE))
{
- bool kanji, all;
+ /* Append to other fake inscriptions if any */
+ if (fake_insc_buf[0]) strcat(fake_insc_buf, ", ");
+ (void)object_desc_num(fake_insc_buf, o_ptr->discount);
#ifdef JP
- kanji = TRUE;
+ strcat(fake_insc_buf, "%°ú¤");
#else
- kanji = FALSE;
+ strcat(fake_insc_buf, "% off");
#endif
- all = abbrev_all;
-
- get_ability_abbreviation(insc_buf, o_ptr, kanji, all);
}
}
- /* Use the standard inscription if available */
- if (o_ptr->inscription)
- {
- char buff[1024];
-
- if (insc_buf[0]) strcat(insc_buf, ", ");
-
- /* Get inscription and convert {%} */
- get_inscription(buff, o_ptr);
-
- /* strcat with correct treating of kanji */
- my_strcat(insc_buf, buff, sizeof(insc_buf));
- }
-
-
- /* Note the discount, if any */
- if (o_ptr->discount &&
- (!insc_buf[0] || (o_ptr->ident & IDENT_STOREB)))
- {
- if (tmp_val2[0]) strcat(tmp_val2, ", ");
-
- (void)object_desc_num(tmp_val2, o_ptr->discount);
-#ifdef JP
- strcat(tmp_val2, "%°ú¤");
-#else
- strcat(tmp_val2, "% off");
-#endif
- }
-
- /* Add insc_buf */
- if (insc_buf[0])
- {
- if (tmp_val2[0]) strcat(tmp_val2, ", ");
-
- strcat(tmp_val2, insc_buf);
- }
-
/* Append the inscription, if any */
- if (tmp_val2[0])
+ if (fake_insc_buf[0] || tmp_val2[0])
{
/* Append the inscription */
t = object_desc_chr(t, ' ');
t = object_desc_chr(t, c1);
- t = object_desc_str(t, tmp_val2);
- t = object_desc_chr(t, c2);
- }
-copyback:
- t = tmp_val;
- for (i = 0; i < MAX_NLEN - 2; i++)
- {
-#ifdef JP
- if (iskanji(*(t + i)))
+ /* Append fake inscriptions */
+ if (fake_insc_buf[0])
{
- *(buf + i) = *(t + i);
- i++;
+ t = object_desc_str(t, fake_insc_buf);
}
-#endif
- *(buf + i) = *(t + i);
- }
- if (i == MAX_NLEN - 2)
- {
-#ifdef JP
- if (iskanji(*(t + i)))
- *(buf + i) = '\0';
- else
-#endif
- *(buf + i) = *(t + i);
+
+ /* Append a separater */
+ if (fake_insc_buf[0] && tmp_val2[0])
+ {
+ t = object_desc_chr(t, ',');
+ t = object_desc_chr(t, ' ');
+ }
+
+ /* Append real inscriptions */
+ if (tmp_val2[0])
+ {
+ t = object_desc_str(t, tmp_val2);
+ }
+
+ t = object_desc_chr(t, c2);
}
- *(buf + MAX_NLEN - 1) = '\0';
+
+object_desc_done:
+ my_strcpy(buf, tmp_val, MAX_NLEN);
}
+
+
if (artifact_p(o_ptr) || o_ptr->art_name) continue;
/* Get a description */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
/* Message */
#ifdef JP
if ((o_ptr->tval != TV_FOOD) && !((o_ptr->tval == TV_CORPSE) && (o_ptr->sval))) continue;
/* Get a description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Message */
#ifdef JP
object_flags(o_ptr, flgs);
/* Acquire the object name */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Acquire the monster name */
monster_desc(m_name, m_ptr, MD_INDEF_HIDDEN);
o_ptr = choose_warning_item();
if (o_ptr)
{
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s¤Ï%s¸÷¤Ã¤¿¡£", o_name, color);
#else
object_flags(o_ptr, oflgs);
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Extra, biased saving throw for blessed items */
if (have_flag(oflgs, TR_BLESSED) && (randint1(888) > chance))
/*
- * Hack -- describe an item currently in a store's inventory
- * This allows an item to *look* like the player is "aware" of it
- */
-void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode)
-{
- /* Save the "aware" flag */
- bool hack_aware = object_aware_p(o_ptr);
-
- /* Save the "known" flag */
- bool hack_known = (o_ptr->ident & (IDENT_KNOWN)) ? TRUE : FALSE;
-
-
- /* Set the "known" flag */
- o_ptr->ident |= (IDENT_KNOWN);
-
- /* Force "aware" for description */
- k_info[o_ptr->k_idx].aware = TRUE;
-
-
- /* Describe the object */
- object_desc(buf, o_ptr, pref, mode);
-
-
- /* Restore "aware" flag */
- k_info[o_ptr->k_idx].aware = hack_aware;
-
- /* Clear the known flag */
- if (!hack_known) o_ptr->ident &= ~(IDENT_KNOWN);
-}
-
-
-
-
-/*
* Determine the "Activation" (if any) for an artifact
* Return a string, or NULL for "no activation"
*/
/* Display Item name */
if (real)
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
else
- object_desc_store(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
prt(o_name, 0, 0);
Term_putstr(0, i, 3, TERM_WHITE, tmp_val);
/* Obtain an item description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Obtain the length of the description */
n = strlen(o_name);
}
else
{
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
attr = tval_to_attr[o_ptr->tval % 128];
}
if (!item_tester_okay(o_ptr)) continue;
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Save the object index, color, and description */
out_index[k] = i;
if (!item_tester_okay(o_ptr) && (!((i == INVEN_LARM) && p_ptr->ryoute) || item_tester_no_ryoute)) continue;
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
if ((i == INVEN_LARM) && p_ptr->ryoute)
{
}
/* Describe */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Prompt */
#ifdef JP
o_ptr = &o_list[floor_list[i]];
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Save the index */
out_index[k] = i;
o_ptr = &o_list[this_o_idx];
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Access the next object */
next_o_idx = o_ptr->next_o_idx;
#endif /* ALLOW_EASY_SENSE */
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
#endif /* ALLOW_EASY_SENSE */
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
#endif /* ALLOW_EASY_SENSE */
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Build a prompt */
#ifdef JP
object_copy(q_ptr, o_ptr);
q_ptr->number = 1;
- object_desc(o_name, q_ptr, TRUE, 0);
+ object_desc(o_name, q_ptr, OD_NAME_ONLY);
do_cmd_write_nikki(NIKKI_HANMEI, 0, o_name);
}
if (object_known_p(j_ptr)) object_known(o_ptr);
/* Hack -- clear "storebought" if only one has it */
- if (((o_ptr->ident & IDENT_STOREB) || (j_ptr->ident & IDENT_STOREB)) &&
- (!((o_ptr->ident & IDENT_STOREB) && (j_ptr->ident & IDENT_STOREB))))
+ if (((o_ptr->ident & IDENT_STORE) || (j_ptr->ident & IDENT_STORE)) &&
+ (!((o_ptr->ident & IDENT_STORE) && (j_ptr->ident & IDENT_STORE))))
{
- if (j_ptr->ident & IDENT_STOREB) j_ptr->ident &= 0xEF;
- if (o_ptr->ident & IDENT_STOREB) o_ptr->ident &= 0xEF;
+ if (j_ptr->ident & IDENT_STORE) j_ptr->ident &= 0xEF;
+ if (o_ptr->ident & IDENT_STORE) o_ptr->ident &= 0xEF;
}
/* Hack -- blend "mental" status */
char o_name[MAX_NLEN];
/* Describe */
- object_desc_store(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
/* Artifact */
if (artifact_p(o_ptr))
#endif
/* Describe object */
- object_desc(o_name, j_ptr, FALSE, 0);
+ object_desc(o_name, j_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Handle normal "breakage" */
char o_name[MAX_NLEN];
/* Get a description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Print a message */
#ifdef JP
char o_name[MAX_NLEN];
/* Get a description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Print a message */
#ifdef JP
q_ptr->number = amt;
/* Describe the object */
- object_desc(o_name, q_ptr, TRUE, 3);
+ object_desc(o_name, q_ptr, 0);
/* Took off weapon */
if (item == INVEN_RARM)
q_ptr->number = amt;
/* Describe local object */
- object_desc(o_name, q_ptr, TRUE, 3);
+ object_desc(o_name, q_ptr, 0);
/* Message */
#ifdef JP
object_prep(q_ptr, k_idx);
/* Describe */
- object_desc_store(o_name, q_ptr, FALSE, 0);
+ object_desc(o_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
/* Mention the object name */
Term_putstr(0, 0, -1, TERM_WHITE, o_name);
{
object_type *o_ptr = choose_warning_item();
- if (o_ptr) object_desc(o_name, o_ptr, FALSE, 0);
+ if (o_ptr) object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
else strcpy(o_name, "ÂÎ"); /* Warning ability without item */
msg_format("%s¤¬±Ô¤¯¿Ì¤¨¤¿¡ª", o_name);
{
object_type *o_ptr = choose_warning_item();
- if (o_ptr) object_desc(o_name, o_ptr, FALSE, 0);
+ if (o_ptr) object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
else strcpy(o_name, "ÂÎ"); /* Warning ability without item */
msg_format("%s¤¬¿Ì¤¨¤¿¡ª", o_name);
if (object_known_p(o_ptr) && (o_ptr->name1 || o_ptr->name2 || o_ptr->art_name || o_ptr->xtra3)) {
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
if (!get_check(format("ËÜÅö¤Ë%s¤«¤éÃê½Ð¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«¡©", o_name))) return;
#else
return;
}
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
use_essence = es_ptr->value;
if ((o_ptr->tval >= TV_SHOT) && (o_ptr->tval <= TV_BOLT)) use_essence = (use_essence+9)/10;
o_ptr = &o_list[0 - item];
}
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
if (!get_check(format("¤è¤í¤·¤¤¤Ç¤¹¤«¡© [%s]", o_name))) return;
#else
(void)inven_carry(q_ptr);
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
msg_format("´äÀФòºï¤Ã¤Æ%s¤òºî¤Ã¤¿¡£",o_name);
#else
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
#else
q_ptr->discount = 99;
- object_desc(o_name, q_ptr, TRUE, 2);
+ object_desc(o_name, q_ptr, 0);
#ifdef JP
msg_format("%s¤òºî¤Ã¤¿¡£", o_name);
#else
}
}
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
msg_format("%s¤ÎËâÎϤò¼è¤ê¹þ¤ó¤À¡£", o_name);
if (known && o_ptr->marked)
{
obvious = TRUE;
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
}
/* Artifacts, and other objects, get to resist */
if (in_generate && cheat_peek)
{
char o_name[MAX_NLEN];
- object_desc_store(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE));
#ifdef JP
msg_format("ÅÁÀâ¤Î¥¢¥¤¥Æ¥à (%s) ¤ÏÀ¸À®Ãæ¤Ë*Ç˲õ*¤µ¤ì¤¿¡£", o_name);
#else
/* Describe the object */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Artifacts have 71% chance to resist */
/* Let's get the name before it is changed... */
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
switch (brand_type)
{
o_ptr->iy = (byte)py;
o_ptr->ix = (byte)px;
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
#ifdef JP
msg_format("%^s¤¬¤¢¤Ê¤¿¤Î¸µ¤ËÈô¤ó¤Ç¤¤¿¡£", o_name);
#else
/* Describe the object */
old_number = o_ptr->number;
o_ptr->number = amt;
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
o_ptr->number = old_number;
/* Verify unless quantity given */
/* Description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Describe */
#ifdef JP
/* Description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Describe */
#ifdef JP
char o_name[MAX_NLEN];
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
if (o_ptr->ident & IDENT_KNOWN)
old_known = TRUE;
record_turn = turn;
/* Description */
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
if(record_fix_art && !old_known && artifact_p(o_ptr))
do_cmd_write_nikki(NIKKI_ART, 0, o_name);
old_known = identify_item(o_ptr);
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe */
if (item >= INVEN_RARM)
handle_stuff();
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe */
if (item >= INVEN_RARM)
/* Artifacts are never destroyed. */
if (artifact_p(o_ptr))
{
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
#ifdef JP
msg_format("ËâÎϤ¬µÕή¤·¤¿¡ª%s¤Ï´°Á´¤ËËâÎϤò¼º¤Ã¤¿¡£", o_name);
#else
else
{
/* Get the object description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/*** Determine Seriousness of Failure ***/
/* Description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Extract the flags */
object_flags(o_ptr, flgs);
/* Description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Extract the flags */
object_flags(o_ptr, flgs);
if (amt)
{
/* Get a description */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
/* Message */
#ifdef JP
/* Describe */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Extract the flags */
object_flags(o_ptr, flgs);
/* Description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
add_flag(o_ptr->art_flags, TR_IGNORE_ACID);
/* Describe */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
/* Attempt a saving throw for artifacts */
if ((o_ptr->art_name || artifact_p(o_ptr)) && (randint0(100) < 50))
/* Describe */
- object_desc(o_name, o_ptr, FALSE, 3);
+ object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
/* Attempt a saving throw */
if ((artifact_p(o_ptr) || o_ptr->art_name) && (randint0(100) < 50) && !force)
/* Artifacts are never destroyed. */
if (artifact_p(o_ptr))
{
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
#ifdef JP
msg_format("ËâÎϤ¬µÕή¤·¤¿¡ª%s¤Ï´°Á´¤ËËâÎϤò¼º¤Ã¤¿¡£", o_name);
#else
else
{
/* Get the object description */
- object_desc(o_name, o_ptr, FALSE, 0);
+ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/*** Determine Seriousness of Failure ***/
object_known(q_ptr);
/* Mark it storebought */
- q_ptr->ident |= IDENT_STOREB;
+ q_ptr->ident |= IDENT_STORE;
/* Mega-Hack -- no chests in stores */
if (q_ptr->tval == TV_CHEST) continue;
if (show_weights) maxwid -= 10;
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
o_name[maxwid] = '\0';
c_put_str(tval_to_attr[o_ptr->tval], o_name, i+6, cur_col);
if (show_weights) maxwid -= 7;
/* Describe the object (fully) */
- object_desc_store(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
o_name[maxwid] = '\0';
c_put_str(tval_to_attr[o_ptr->tval], o_name, i+6, cur_col);
else
{
/* Describe the object (fully) */
- object_desc_store(o_name, j_ptr, TRUE, 3);
+ object_desc(o_name, j_ptr, 0);
/* Message */
#ifdef JP
j_ptr->ident &= ~(IDENT_FIXED);
/* Describe the transaction */
- object_desc(o_name, j_ptr, TRUE, 3);
+ object_desc(o_name, j_ptr, 0);
/* Message */
#ifdef JP
record_turn = turn;
if (record_buy) do_cmd_write_nikki(NIKKI_BUY, 0, o_name);
- object_desc(o_name, o_ptr, TRUE, 0);
+ object_desc(o_name, o_ptr, OD_NAME_ONLY);
if(record_rand_art && o_ptr->art_name)
do_cmd_write_nikki(NIKKI_ART, 0, o_name);
/* Erase the "feeling" */
j_ptr->feeling = FEEL_NONE;
- j_ptr->ident &= ~(IDENT_STOREB);
+ j_ptr->ident &= ~(IDENT_STORE);
/* Give it to the player */
item_new = inven_carry(j_ptr);
/* Describe the final result */
- object_desc(o_name, &inventory[item_new], TRUE, 3);
+ object_desc(o_name, &inventory[item_new], 0);
/* Message */
#ifdef JP
item_new = inven_carry(j_ptr);
/* Describe just the result */
- object_desc(o_name, &inventory[item_new], TRUE, 3);
+ object_desc(o_name, &inventory[item_new], 0);
/* Message */
#ifdef JP
}
/* Get a full description */
- object_desc(o_name, q_ptr, TRUE, 3);
+ object_desc(o_name, q_ptr, 0);
/* Remove any inscription, feeling for stores */
if ((cur_store_num != STORE_HOME) && (cur_store_num != STORE_MUSEUM))
/* Modify quantity */
q_ptr->number = amt;
- /* Make it look like known */
- q_ptr->ident |= IDENT_STOREB;
+ /* Make it look like to be known */
+ q_ptr->ident |= IDENT_STORE;
/*
* Hack -- If a rod or wand, let the shopkeeper know just
value = object_value(q_ptr) * q_ptr->number;
/* Get the description all over again */
- object_desc(o_name, q_ptr, TRUE, 3);
+ object_desc(o_name, q_ptr, 0);
/* Describe the result (in message buffer) */
#ifdef JP
else if (cur_store_num == STORE_MUSEUM)
{
char o2_name[MAX_NLEN];
- object_desc(o2_name, q_ptr, TRUE, 0);
+ object_desc(o2_name, q_ptr, OD_NAME_ONLY);
if (-1 == store_check_num(q_ptr))
{
}
/* Description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe */
#ifdef JP
object_copy(q_ptr, o_ptr);
/* Describe it */
- object_desc(o_name, q_ptr, TRUE, 3);
+ object_desc(o_name, q_ptr, 0);
/* Message */
#ifdef JP
st_ptr = &town[p_ptr->town_num].store[STORE_BLACK];
- o_ptr->ident |= IDENT_STOREB;
+ o_ptr->ident |= IDENT_STORE;
(void)store_carry(o_ptr);
/* Description (too brief) */
- object_desc_store(buf, q_ptr, FALSE, 0);
+ object_desc(buf, q_ptr, (OD_NAME_ONLY | OD_STORE));
/* Misc info */
static void analyze_general(object_type *o_ptr, char *desc_ptr)
{
/* Get a "useful" description of the object */
- object_desc_store(desc_ptr, o_ptr, TRUE, 1);
+ object_desc(desc_ptr, o_ptr, (OD_NAME_AND_ENCHANT | OD_STORE));
}
prt_alloc(o_ptr->tval, o_ptr->sval, 1, 0);
/* Describe fully */
- object_desc_store(buf, o_ptr, TRUE, 3);
+ object_desc(buf, o_ptr, OD_STORE);
prt(buf, 2, j);
next_o_idx = o_ptr->next_o_idx;
/* Obtain an object description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe the object */
#ifdef JP
o_ptr = &o_list[floor_list[0]];
/* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Message */
#ifdef JP
boring = FALSE;
/* Obtain an object description */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Describe the object */
#ifdef JP
msg_print("'Thou reliest too much on thy weapon.'");
#endif
- object_desc(o_name, &inventory[INVEN_RARM], TRUE, 0);
+ object_desc(o_name, &inventory[INVEN_RARM], OD_NAME_ONLY);
(void)curse_weapon(FALSE, INVEN_RARM);
#ifdef JP
reward = format("%s¤¬Ç˲õ¤µ¤ì¤¿¡£", o_name);
msg_print("'Thou reliest too much on thine equipment.'");
#endif
- object_desc(o_name, &inventory[INVEN_BODY], TRUE, 0);
+ object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
(void)curse_armor();
#ifdef JP
reward = format("%s¤¬Ç˲õ¤µ¤ì¤¿¡£", o_name);
if (one_in_(2))
{
if (!buki_motteruka(INVEN_RARM)) break;
- object_desc(o_name, &inventory[INVEN_RARM], TRUE, 0);
+ object_desc(o_name, &inventory[INVEN_RARM], OD_NAME_ONLY);
(void)curse_weapon(FALSE, INVEN_RARM);
#ifdef JP
reward = format("%s¤¬Ç˲õ¤µ¤ì¤¿¡£", o_name);
else
{
if (!inventory[INVEN_BODY].k_idx) break;
- object_desc(o_name, &inventory[INVEN_BODY], TRUE, 0);
+ object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
(void)curse_armor();
#ifdef JP
reward = format("%s¤¬Ç˲õ¤µ¤ì¤¿¡£", o_name);
OSDN Git Service
