From 6176203b791b5827b27371cdb66987a841e989e9 Mon Sep 17 00:00:00 2001 From: nothere Date: Thu, 19 Jun 2003 13:39:04 +0000 Subject: [PATCH] =?utf8?q?=E5=BF=8D=E8=80=85=E3=81=AE=E6=9A=97=E8=A6=96?= =?utf8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=81=AE=E5=A4=89=E6=9B=B4.?= =?utf8?q?=20*=20view=5Funsafe=5Fgrids=E3=81=A8=E3=81=AE=E5=85=BC=E3=81=AD?= =?utf8?q?=E5=90=88=E3=81=84=E3=82=92=E8=80=83=E3=81=88=E3=81=A6,=20?= =?utf8?q?=E5=BA=8A=E3=82=92=E8=A6=8B=E3=81=9F=E3=81=A0=E3=81=91=E3=81=A7?= =?utf8?q?=E3=81=AFCAVE=5FMARK=E3=81=8C=20=20=20=E7=AB=8B=E3=81=9F?= =?utf8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4.?= =?utf8?q?=20=E8=A6=96=E7=95=8C=E5=86=85=E3=81=AB=E3=81=82=E3=82=8B?= =?utf8?q?=E3=81=A8=E3=81=8D=E3=81=AF=E5=BA=8A=E3=81=AB=E8=A6=8B=E3=81=88?= =?utf8?q?=E3=82=8B=E3=81=8C,=20=E3=81=9D=E3=81=AE=E5=BA=8A=E3=81=8C?= =?utf8?q?=E8=A6=96=E7=95=8C=E3=81=8B=20=20=20=E3=82=89=E9=9B=A2=E3=82=8C?= =?utf8?q?=E3=81=9F=E3=82=89=E6=9C=AA=E7=9F=A5=E3=81=AE=E5=9C=B0=E5=BD=A2?= =?utf8?q?=E3=82=82=E3=81=97=E3=81=8F=E3=81=AF'x'=E3=81=AB=E3=81=AA?= =?utf8?q?=E3=82=8B.=20*=20=E5=BF=8D=E8=80=85=E3=81=AE=E8=A6=96=E7=95=8C?= =?utf8?q?=E3=81=AF=E5=85=89=E6=BA=90=E3=81=AE=E4=B8=80=E7=A8=AE=E3=81=A8?= =?utf8?q?=E3=81=BF=E3=81=AA=E3=81=97,=20=E5=BF=8D=E8=80=85=E3=81=AE?= =?utf8?q?=E8=A6=96=E7=95=8C=E3=81=AE=E5=BA=8A=E3=82=92CAVE=5FMARK?= =?utf8?q?=E3=81=A7=E8=A8=98=E6=86=B6=E3=81=99=E3=82=8B=20=20=20=E3=81=AE?= =?utf8?q?=E3=81=AFview=5Ftorch=5Fgrids=E3=81=8CON=E3=81=AE=E6=99=82?= =?utf8?q?=E3=81=A8=E3=81=97=E3=81=9F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cave.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/cave.c b/src/cave.c index 0354c21b8..3a7f6c9a1 100644 --- a/src/cave.c +++ b/src/cave.c @@ -894,11 +894,11 @@ void map_info(int y, int x, byte *ap, char *cp) if ((feat <= FEAT_INVIS) || (feat == FEAT_DIRT) || (feat == FEAT_GRASS)) { /* Memorized (or visible) floor */ - if ((c_ptr->info & CAVE_MARK) || - (((c_ptr->info & CAVE_LITE) || (c_ptr->info & CAVE_MNLT) || - ((c_ptr->info & CAVE_GLOW) && - (c_ptr->info & CAVE_VIEW))) && - !p_ptr->blind)) + if ((c_ptr->info & CAVE_MARK) || + (((c_ptr->info & (CAVE_LITE | CAVE_MNLT)) || + ((c_ptr->info & CAVE_VIEW) && + ((c_ptr->info & CAVE_GLOW) || (p_ptr->pclass == CLASS_NINJA)))) && + !p_ptr->blind)) { /* Access floor */ f_ptr = &f_info[feat]; @@ -1692,8 +1692,8 @@ void note_spot(int y, int x) if (p_ptr->pclass != CLASS_NINJA) { - /* Require "perma-lite" of the grid */ - if (!(c_ptr->info & (CAVE_GLOW | CAVE_MNLT))) return; + /* Require "perma-lite" of the grid */ + if (!(c_ptr->info & (CAVE_GLOW | CAVE_MNLT))) return; } } @@ -1714,15 +1714,12 @@ void note_spot(int y, int x) /* Hack -- memorize grids */ if (!(c_ptr->info & (CAVE_MARK))) { - if (p_ptr->pclass == CLASS_NINJA) - { - c_ptr->info |= (CAVE_MARK); - } /* Handle floor grids first */ if ((feat <= FEAT_INVIS) || (feat == FEAT_DIRT) || (feat == FEAT_GRASS)) { /* Option -- memorize all torch-lit floors */ - if (view_torch_grids && (c_ptr->info & (CAVE_LITE | CAVE_MNLT))) + if (view_torch_grids && + ((c_ptr->info & (CAVE_LITE | CAVE_MNLT)) || (p_ptr->pclass == CLASS_NINJA))) { /* Memorize */ c_ptr->info |= (CAVE_MARK); @@ -1750,6 +1747,13 @@ void note_spot(int y, int x) c_ptr->info |= (CAVE_MARK); } + /* Mwemorize walls seen by noctovision of Ninja */ + else if (p_ptr->pclass == CLASS_NINJA) + { + /* Memorize */ + c_ptr->info |= (CAVE_MARK); + } + /* Memorize certain non-torch-lit wall grids */ else { -- 2.11.0