From 830dfc93d7ac64879e8ee0578c4b371ec3db8f69 Mon Sep 17 00:00:00 2001 From: nothere Date: Sat, 27 Mar 2004 14:11:29 +0000 Subject: [PATCH] =?utf8?q?=E7=8F=BE=E7=8A=B6=E3=81=A7=E3=81=AF=E8=AA=AC?= =?utf8?q?=E6=98=8E=E6=96=87=E3=81=A0=E3=81=91=E3=81=AE=E3=82=A2=E3=82=A4?= =?utf8?q?=E3=83=86=E3=83=A0=E3=81=AE=E8=AA=AC=E6=98=8E=E3=82=92=E5=85=A8?= =?utf8?q?=E3=81=8F=E8=AA=AD=E3=82=81=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7,?= =?utf8?q?=20=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89'I'=E5=8F=8A=E3=81=B3=20?= =?utf8?q?=E3=82=A6=E3=82=A3=E3=82=B6=E3=83=BC=E3=83=89=E3=83=A2=E3=83=BC?= =?utf8?q?=E3=83=89=E6=99=82=E3=81=AE=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0?= =?utf8?q?=E3=81=AE=E7=9F=A5=E8=AD=98=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?utf8?q?=E3=81=AE=E8=A9=B3=E7=B4=B0=E5=8F=82=E7=85=A7=E3=81=A7=E3=81=AE?= =?utf8?q?=E3=81=BF=E8=AA=AC=E6=98=8E=E6=96=87=E3=82=92=E8=A1=A8=20?= =?utf8?q?=E7=A4=BA=E3=81=97,=20=E3=81=9D=E3=82=8C=E4=BB=A5=E5=A4=96?= =?utf8?q?=E3=81=A7=E3=81=AF=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84?= =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4.=20=E9=96=A2?= =?utf8?q?=E9=80=A3=E3=81=97=E3=81=A6,=20=E4=BB=A5=E4=B8=8B=E3=81=AE?= =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=82=92=E5=90=AB=E3=82=80.=20*=20=E3=82=AF?= =?utf8?q?=E3=83=AD=E3=82=B9=E3=83=9C=E3=82=A6=E3=81=AE=E7=9F=A2=E3=81=A8?= =?utf8?q?=E9=8B=BC=E9=89=84=E3=81=AE=E3=82=AF=E3=83=AD=E3=82=B9=E3=83=9C?= =?utf8?q?=E3=82=A6=E3=81=AE=E7=9F=A2=E3=81=AE=E3=82=88=E3=81=86=E3=81=ABt?= =?utf8?q?val=E3=81=A8sval=E3=81=AE=E4=B8=A1=E6=96=B9=E3=81=8C=E5=90=8C?= =?utf8?q?=E3=81=98=20=20=20=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=81=8C?= =?utf8?q?=E3=81=82=E3=82=8B=E5=A0=B4=E5=90=88,=20k=5Fidx=E3=81=8C?= =?utf8?q?=E5=A4=A7=E3=81=8D=E3=81=84=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0?= =?utf8?q?=E3=81=AE=E8=AA=AC=E6=98=8E=E6=96=87=E3=81=8C=E6=AD=A3=E3=81=97?= =?utf8?q?=E3=81=8F=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=20=20=20?= =?utf8?q?=E3=81=84=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/artifact.c | 2 +- src/cmd3.c | 4 ++-- src/cmd4.c | 2 +- src/defines.h | 6 ++++++ src/externs.h | 2 +- src/object1.c | 10 ++++++---- src/spells3.c | 2 +- src/store.c | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/artifact.c b/src/artifact.c index eb6db9555..1c8b38b8b 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1915,7 +1915,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll) /* Mark the item as fully known */ o_ptr->ident |= (IDENT_MENTAL); - (void)screen_object(o_ptr, TRUE); + (void)screen_object(o_ptr, 0L); if (!get_string(ask_msg, dummy_name, sizeof dummy_name) || !dummy_name[0]) diff --git a/src/cmd3.c b/src/cmd3.c index 0a7308a6e..cf23e2996 100644 --- a/src/cmd3.c +++ b/src/cmd3.c @@ -1235,9 +1235,9 @@ void do_cmd_observe(void) /* Describe it fully */ #ifdef JP - if (!screen_object(o_ptr, TRUE)) msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£"); + if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£"); #else - if (!screen_object(o_ptr, TRUE)) msg_print("You see nothing special."); + if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) msg_print("You see nothing special."); #endif } diff --git a/src/cmd4.c b/src/cmd4.c index 47ea5182d..cff0ef0a7 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -8102,7 +8102,7 @@ static void desc_obj_fake(int k_idx) /* Hack -- Handle stuff */ handle_stuff(); - if (!screen_object(o_ptr, FALSE)) + if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL)) { #ifdef JP msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£"); diff --git a/src/defines.h b/src/defines.h index 4d55fe7b3..c27baaea8 100644 --- a/src/defines.h +++ b/src/defines.h @@ -5505,3 +5505,9 @@ extern int PlayerUID; #define MON_CONFUSED(M_PTR) ((M_PTR)->mtimed[MTIMED_CONFUSED]) #define MON_MONFEAR(M_PTR) ((M_PTR)->mtimed[MTIMED_MONFEAR]) #define MON_INVULNER(M_PTR) ((M_PTR)->mtimed[MTIMED_INVULNER]) + +/* + * Bit flags for screen_object() + */ +#define SCROBJ_FAKE_OBJECT 0x00000001 +#define SCROBJ_FORCE_DETAIL 0x00000002 diff --git a/src/externs.h b/src/externs.h index 4af96dbbb..d3b1b0c43 100644 --- a/src/externs.h +++ b/src/externs.h @@ -939,7 +939,7 @@ 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 cptr item_activation(object_type *o_ptr); -extern bool screen_object(object_type *o_ptr, bool real); +extern bool screen_object(object_type *o_ptr, u32b mode); extern char index_to_label(int i); extern s16b label_to_inven(int c); extern s16b label_to_equip(int c); diff --git a/src/object1.c b/src/object1.c index c24736b70..06eaf5911 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2347,7 +2347,7 @@ return " /* * Describe a "fully identified" item */ -bool screen_object(object_type *o_ptr, bool real) +bool screen_object(object_type *o_ptr, u32b mode) { int i = 0, j, k; @@ -2367,7 +2367,7 @@ bool screen_object(object_type *o_ptr, bool real) char temp[70 * 20]; roff_to_buf(o_ptr->name1 ? (a_text + a_info[o_ptr->name1].text) : - (k_text + k_info[lookup_kind(o_ptr->tval, o_ptr->sval)].text), + (k_text + k_info[o_ptr->k_idx].text), 77 - 15, temp, sizeof(temp)); for (j = 0; temp[j]; j += 1 + strlen(&temp[j])) { info[i] = &temp[j]; i++;} @@ -3757,7 +3757,7 @@ info[i++] = " } /* Describe about this kind of object instead of THIS fake object */ - if (!real) + if (mode & SCROBJ_FAKE_OBJECT) { switch (o_ptr->tval) { @@ -3855,6 +3855,8 @@ info[i++] = " } } + if (mode & SCROBJ_FORCE_DETAIL) trivial_info = 0; + /* No relevant informations */ if (i <= trivial_info) return (FALSE); @@ -3865,7 +3867,7 @@ info[i++] = " Term_get_size(&wid, &hgt); /* Display Item name */ - if (real) + if (!(mode & SCROBJ_FAKE_OBJECT)) object_desc(o_name, o_ptr, 0); else object_desc(o_name, o_ptr, (OD_NAME_ONLY | OD_STORE)); diff --git a/src/spells3.c b/src/spells3.c index ebc603394..6c9822164 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -3076,7 +3076,7 @@ s = " } /* Describe it fully */ - (void)screen_object(o_ptr, TRUE); + (void)screen_object(o_ptr, 0L); /* Auto-inscription/destroy */ autopick_alter_item(item, (bool)(destroy_identify && !old_known)); diff --git a/src/store.c b/src/store.c index 429b96239..835a1e385 100644 --- a/src/store.c +++ b/src/store.c @@ -4098,7 +4098,7 @@ msg_format("%s /* Describe it fully */ - if (!screen_object(o_ptr, TRUE)) + if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) #ifdef JP msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£"); #else -- 2.11.0