[Refactor] #39076 冗長なコメントを削除しつつ、 OBJECT_IS_VALID() マクロに置換。

[hengband/hengband.git] / src / spells2.c

diff --git a/src/spells2.c b/src/spells2.c
index d73fdd0..06820a0 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -207,8 +207,7 @@ bool detect_objects_gold(POSITION range)
        {
                object_type *o_ptr = &current_floor_ptr->o_list[i];
 
-               /* Skip dead objects */
-               if (!o_ptr->k_idx) continue;
+               if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                /* Skip held objects */
                if (o_ptr->held_m_idx) continue;
@@ -262,8 +261,7 @@ bool detect_objects_normal(POSITION range)
        {
                object_type *o_ptr = &current_floor_ptr->o_list[i];
 
-               /* Skip dead objects */
-               if (!o_ptr->k_idx) continue;
+               if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                /* Skip held objects */
                if (o_ptr->held_m_idx) continue;
@@ -325,8 +323,7 @@ bool detect_objects_magic(POSITION range)
        {
                object_type *o_ptr = &current_floor_ptr->o_list[i];
 
-               /* Skip dead objects */
-               if (!o_ptr->k_idx) continue;
+               if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                /* Skip held objects */
                if (o_ptr->held_m_idx) continue;