p_ptr->tim_invisとp_ptr->tim_reflectの扱いを少し整理.

diff --git a/src/files.c b/src/files.c
index 2a85862..b640b2c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2672,9 +2672,8 @@ static void tim_player_flags(u32b flgs[TR_FLAG_SIZE])
        if (p_ptr->wraith_form)
                add_flag(flgs, TR_REFLECT);
        /* by henkma */
-       if (p_ptr->tim_reflect){
+       if (p_ptr->tim_reflect)
                add_flag(flgs, TR_REFLECT);
-       }
 
        if (p_ptr->magicdef)
        {

diff --git a/src/spells1.c b/src/spells1.c
index 11bec83..80d40a4 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -6435,7 +6435,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
        if (!who) return (FALSE);
        if (who == p_ptr->riding) return (FALSE);
 
-       if ((p_ptr->reflect || p_ptr->tim_reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
+       if ((p_ptr->reflect || ((p_ptr->special_defense & KATA_FUUJIN) && !p_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
        {
                byte t_y, t_x;
                int max_attempts = 10;

diff --git a/src/spells2.c b/src/spells2.c
index c40e6e4..1a43b80 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4021,8 +4021,7 @@ bool detect_monsters_normal(int range)
                if (distance(py, px, y, x) > range) continue;
 
                /* Detect all non-invisible monsters */
-               if ((!(r_ptr->flags2 & RF2_INVISIBLE)) ||
-                   p_ptr->see_inv || p_ptr->tim_invis)
+               if (!(r_ptr->flags2 & RF2_INVISIBLE) || p_ptr->see_inv)
                {
                        /* Repair visibility later */
                        repair_monsters = TRUE;

diff --git a/src/xtra1.c b/src/xtra1.c
index 5514bca..0dd2338 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -4485,6 +4485,12 @@ void calc_bonuses(void)
                p_ptr->ffall = TRUE;
        }
 
+       /* Temporary reflection */
+       if (p_ptr->tim_reflect)
+       {
+               p_ptr->reflect = TRUE;
+       }
+
        /* Hack -- Hero/Shero -> Res fear */
        if (IS_HERO() || p_ptr->shero)
        {