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

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

diff --git a/src/object2.c b/src/object2.c
index ef0e5f9..bd4f411 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -344,8 +344,7 @@ void compact_objects(int size)
                {
                        o_ptr = &current_floor_ptr->o_list[i];
 
-                       /* Skip dead objects */
-                       if (!o_ptr->k_idx) continue;
+                       if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                        /* Hack -- High level objects start out "immune" */
                        if (k_info[o_ptr->k_idx].level > cur_lev) continue;
@@ -430,8 +429,7 @@ void wipe_o_list(void)
        {
                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;
 
                /* Mega-Hack -- preserve artifacts */
                if (!current_world_ptr->character_dungeon || preserve_mode)