From 046ffc9b07abaa3d9eb86f485b75dc79a82ba712 Mon Sep 17 00:00:00 2001 From: mogami Date: Wed, 11 Sep 2002 15:01:58 +0000 Subject: [PATCH] =?utf8?q?'l'ook=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?= =?utf8?q?=E3=81=A7=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9=E3=82=AD=E3=83=BC?= =?utf8?q?=E3=81=A7=E8=88=88=E5=91=B3=E3=81=AE=E3=81=82=E3=82=8B=E5=9C=B0?= =?utf8?q?=E5=BD=A2=E3=82=92=E5=B7=A1=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?= =?utf8?q?=E3=81=A8=E3=81=8D=E3=80=81=20=E9=9A=A0=E3=81=97=E6=89=89?= =?utf8?q?=E3=82=84=E9=9A=A0=E3=81=97=E3=83=88=E3=83=A9=E3=83=83=E3=83=97?= =?utf8?q?=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=81=AB=E3=82=82=E3=82=AB=E3=83=BC?= =?utf8?q?=E3=82=BD=E3=83=AB=E3=81=8C=E6=9D=A5=E3=81=A6=E3=81=97=E3=81=BE?= =?utf8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/xtra2.c | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/src/xtra2.c b/src/xtra2.c index 2549d3890..3de15769e 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2810,57 +2810,62 @@ static bool target_set_accept(int y, int x) /* Interesting memorized features */ if (c_ptr->info & (CAVE_MARK)) { + byte feat; + + /* Feature code (applying "mimic" field) */ + feat = c_ptr->mimic ? c_ptr->mimic : f_info[c_ptr->feat].mimic; + /* Notice glyphs */ if (c_ptr->info & CAVE_OBJECT) return (TRUE); /* Notice the Pattern */ - if ((c_ptr->feat <= FEAT_PATTERN_XTRA2) && - (c_ptr->feat >= FEAT_PATTERN_START)) + if ((feat <= FEAT_PATTERN_XTRA2) && + (feat >= FEAT_PATTERN_START)) return (TRUE); /* Notice doors */ - if (c_ptr->feat == FEAT_OPEN) return (TRUE); - if (c_ptr->feat == FEAT_BROKEN) return (TRUE); + if (feat == FEAT_OPEN) return (TRUE); + if (feat == FEAT_BROKEN) return (TRUE); /* Notice stairs */ - if (c_ptr->feat == FEAT_LESS) return (TRUE); - if (c_ptr->feat == FEAT_MORE) return (TRUE); - if (c_ptr->feat == FEAT_LESS_LESS) return (TRUE); - if (c_ptr->feat == FEAT_MORE_MORE) return (TRUE); + if (feat == FEAT_LESS) return (TRUE); + if (feat == FEAT_MORE) return (TRUE); + if (feat == FEAT_LESS_LESS) return (TRUE); + if (feat == FEAT_MORE_MORE) return (TRUE); /* Notice shops */ - if ((c_ptr->feat >= FEAT_SHOP_HEAD) && - (c_ptr->feat <= FEAT_SHOP_TAIL)) return (TRUE); + if ((feat >= FEAT_SHOP_HEAD) && + (feat <= FEAT_SHOP_TAIL)) return (TRUE); - if (c_ptr->feat == FEAT_MUSEUM) return (TRUE); + if (feat == FEAT_MUSEUM) return (TRUE); /* Notice buildings -KMW- */ - if ((c_ptr->feat >= FEAT_BLDG_HEAD) && - (c_ptr->feat <= FEAT_BLDG_TAIL)) return (TRUE); + if ((feat >= FEAT_BLDG_HEAD) && + (feat <= FEAT_BLDG_TAIL)) return (TRUE); /* Notice traps */ - if (is_trap(c_ptr->feat)) return (TRUE); + if (is_trap(feat)) return (TRUE); /* Notice doors */ - if ((c_ptr->feat >= FEAT_DOOR_HEAD) && - (c_ptr->feat <= FEAT_DOOR_TAIL)) return (TRUE); + if ((feat >= FEAT_DOOR_HEAD) && + (feat <= FEAT_DOOR_TAIL)) return (TRUE); /* Notice rubble */ /* I think FEAT_RUBBLEs should not be "interesting" */ #if 0 - if (c_ptr->feat == FEAT_RUBBLE) return (TRUE); + if (feat == FEAT_RUBBLE) return (TRUE); #endif /* Notice veins with treasure */ - if (c_ptr->feat == FEAT_MAGMA_K) return (TRUE); - if (c_ptr->feat == FEAT_QUARTZ_K) return (TRUE); + if (feat == FEAT_MAGMA_K) return (TRUE); + if (feat == FEAT_QUARTZ_K) return (TRUE); /* Notice quest features */ - if (c_ptr->feat == FEAT_QUEST_ENTER) return (TRUE); - if (c_ptr->feat == FEAT_QUEST_EXIT) return (TRUE); - if (c_ptr->feat == FEAT_QUEST_DOWN) return (TRUE); - if (c_ptr->feat == FEAT_QUEST_UP) return (TRUE); - if (c_ptr->feat == FEAT_TOWN) return (TRUE); - if (c_ptr->feat == FEAT_ENTRANCE) return (TRUE); + if (feat == FEAT_QUEST_ENTER) return (TRUE); + if (feat == FEAT_QUEST_EXIT) return (TRUE); + if (feat == FEAT_QUEST_DOWN) return (TRUE); + if (feat == FEAT_QUEST_UP) return (TRUE); + if (feat == FEAT_TOWN) return (TRUE); + if (feat == FEAT_ENTRANCE) return (TRUE); } /* Nope */ -- 2.11.0