From cec59b5aaf3377f533e4a30af3fa9ffff276a143 Mon Sep 17 00:00:00 2001 From: nothere Date: Sat, 29 May 2004 17:38:10 +0000 Subject: [PATCH] =?utf8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3ign?= =?utf8?q?ore=5Funview,=20disturb=5Fnear=E3=81=AF=E8=A6=96=E7=95=8C?= =?utf8?q?=E5=86=85=E3=81=A7=E3=81=82=E3=81=A3=E3=81=A6=E3=82=82=E9=AD=94?= =?utf8?q?=E6=B3=95=E3=81=8C=E5=B1=8A=E3=81=8B=E3=81=AA=E3=81=84=20?= =?utf8?q?=E5=A0=B4=E6=89=80=E3=82=92=E8=A6=96=E7=95=8C=E5=A4=96=E3=81=A8?= =?utf8?q?=E3=81=BF=E3=81=AA=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?utf8?q?=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/defines.h | 3 ++- src/melee2.c | 2 +- src/spells1.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/defines.h b/src/defines.h index 15ec36b2a..8058e8a1b 100644 --- a/src/defines.h +++ b/src/defines.h @@ -4009,7 +4009,8 @@ * Is the monster seen by the player? */ #define is_seen(A) \ - ((bool) ((A)->ml && (!ignore_unview || player_can_see_bold((A)->fy, (A)->fx)))) + ((bool)((A)->ml && (!ignore_unview || \ + (player_can_see_bold((A)->fy, (A)->fx) && projectable(py, px, (A)->fy, (A)->fx))))) /*** Option Definitions ***/ diff --git a/src/melee2.c b/src/melee2.c index f50ae3a83..222f416a9 100644 --- a/src/melee2.c +++ b/src/melee2.c @@ -3318,7 +3318,7 @@ msg_format("%^s%s", m_name, monmessage); /* Possible disturb */ if (m_ptr->ml && (disturb_move || - (disturb_near && (m_ptr->mflag & MFLAG_VIEW)) || + (disturb_near && (m_ptr->mflag & MFLAG_VIEW) && projectable(py, px, m_ptr->fy, m_ptr->fx)) || (disturb_high && ap_r_ptr->r_tkills && ap_r_ptr->level >= p_ptr->lev))) { /* Disturb */ diff --git a/src/spells1.c b/src/spells1.c index fc5c2ad9a..621071dbf 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -8895,7 +8895,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons if (flg & PROJECT_KILL) { see_s_msg = (who > 0) ? is_seen(&m_list[who]) : - (!who ? TRUE : player_can_see_bold(y1, x1)); + (!who ? TRUE : (player_can_see_bold(y1, x1) && projectable(py, px, y1, x1))); } -- 2.11.0