マクロを使うよりフラグLOSやSPECIALを直接見た方がいい部分の変更.

diff --git a/src/cave.c b/src/cave.c
index aac2272..91b0d32 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -494,7 +494,6 @@ void update_local_illumination(int y, int x)
 bool player_can_see_bold(int y, int x)
 {
        cave_type *c_ptr;
-       s16b feat;
 
        /* Blind players see nothing */
        if (p_ptr->blind) return FALSE;
@@ -515,10 +514,8 @@ bool player_can_see_bold(int y, int x)
        if ((c_ptr->info & (CAVE_GLOW | CAVE_MNDK)) != CAVE_GLOW) return FALSE;
 
        /* Feature code (applying "mimic" field) */
-       feat = get_feat_mimic(c_ptr);
-
        /* Floors are simple */
-       if (feat_supports_los(feat)) return TRUE;
+       if (feat_supports_los(get_feat_mimic(c_ptr))) return TRUE;
 
        /* Check for "local" illumination */
        return check_local_illumination(y, x);
@@ -757,7 +754,7 @@ byte lighting_colours[16][2] =
  */
 #define darkened_grid_hack() \
 { \
-       if (feat_supports_los(feat)) \
+       if (have_flag(f_ptr->flags, FF_LOS)) \
        { \
                /* Unsafe cave grid -- idea borrowed from Unangband */ \
                if (view_unsafe_grids && (c_ptr->info & CAVE_UNSAFE)) \
@@ -1093,7 +1090,7 @@ void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp)
                                        }
 
                                        /* Not glowing correctly */
-                                       else if (!feat_supports_los(feat) && !check_local_illumination(y, x))
+                                       else if (!have_flag(f_ptr->flags, FF_LOS) && !check_local_illumination(y, x))
                                        {
                                                /* Use a darkened colour/tile */
                                                a = f_ptr->x_attr[F_LIT_DARK];
@@ -1459,10 +1456,10 @@ void note_spot(int y, int x)
        if (!(c_ptr->info & (CAVE_MARK)))
        {
                /* Feature code (applying "mimic" field) */
-               s16b feat = get_feat_mimic(c_ptr);
+               feature_type *f_ptr = &f_info[get_feat_mimic(c_ptr)];
 
                /* Memorize some "boring" grids */
-               if (!have_flag(f_info[feat].flags, FF_REMEMBER))
+               if (!have_flag(f_ptr->flags, FF_REMEMBER))
                {
                        /* Option -- memorize all torch-lit floors */
                        if (view_torch_grids &&
@@ -1481,7 +1478,7 @@ void note_spot(int y, int x)
                }
 
                /* Memorize normal grids */
-               else if (feat_supports_los(feat))
+               else if (have_flag(f_ptr->flags, FF_LOS))
                {
                        /* Memorize */
                        c_ptr->info |= (CAVE_MARK);

diff --git a/src/floors.c b/src/floors.c
index 0897b13..d3494ea 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -935,7 +935,7 @@ void leave_floor(void)
                f_ptr = &f_info[c_ptr->feat];
 
                /* Get back to old saved floor? */
-               if (c_ptr->special && !feat_uses_special(c_ptr->feat) && get_sf_ptr(c_ptr->special))
+               if (c_ptr->special && !have_flag(f_ptr->flags, FF_SPECIAL) && get_sf_ptr(c_ptr->special))
                {
                        /* Saved floor is exist.  Use it. */
                        new_floor_id = c_ptr->special;

diff --git a/src/mspells1.c b/src/mspells1.c
index 6ab2bb9..538ea89 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1322,13 +1322,15 @@ bool make_attack_spell(int m_idx)
        /* Check path */
        if (projectable(m_ptr->fy, m_ptr->fx, y, x))
        {
-               if (!have_flag(f_flags_bold(y, x), FF_PROJECT))
+               feature_type *f_ptr = &f_info[cave[y][x].feat];
+
+               if (!have_flag(f_ptr->flags, FF_PROJECT))
                {
                        /* Breath disintegration to the wall if possible */
-                       if ((f4 & RF4_BR_DISI) && have_flag(f_flags_bold(y, x), FF_HURT_DISI) && one_in_(2)) do_spell = DO_SPELL_BR_DISI;
+                       if ((f4 & RF4_BR_DISI) && have_flag(f_ptr->flags, FF_HURT_DISI) && one_in_(2)) do_spell = DO_SPELL_BR_DISI;
 
                        /* Breath lite to the transparent wall if possible */
-                       else if ((f4 & RF4_BR_LITE) && cave_los_bold(y, x) && one_in_(2)) do_spell = DO_SPELL_BR_LITE;
+                       else if ((f4 & RF4_BR_LITE) && have_flag(f_ptr->flags, FF_LOS) && one_in_(2)) do_spell = DO_SPELL_BR_LITE;
                }
        }