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

diff --git a/src/core.c b/src/core.c
index e28b38f..85276a1 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -2908,8 +2908,7 @@ static void process_world_aux_recharge(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;
 
                /* Recharge rods on the ground.  No messages. */
                if ((o_ptr->tval == TV_ROD) && (o_ptr->timeout))

diff --git a/src/floor-events.c b/src/floor-events.c
index ee42477..86ff69d 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -40,7 +40,6 @@ void day_break()
                                /* Hack -- Memorize lit grids if allowed */
                                if (view_perma_grids) g_ptr->info |= (CAVE_MARK);
 
-                               /* Hack -- Notice spot */
                                note_spot(y, x);
                        }
                }
@@ -85,13 +84,11 @@ void night_falls(void)
                                                /* Forget the normal floor grid */
                                                g_ptr->info &= ~(CAVE_MARK);
 
-                                               /* Hack -- Notice spot */
                                                note_spot(y, x);
                                        }
                                }
                        }
 
-                       /* Glow deep lava and building entrances */
                        glow_deep_lava_and_bldg();
                }
        }
@@ -205,8 +202,7 @@ byte get_dungeon_feeling(void)
                object_kind *k_ptr = &k_info[o_ptr->k_idx];
                int delta = 0;
 
-               /* Skip dead objects */
-               if (!o_ptr->k_idx) continue;
+               if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                /* Skip known objects */
                if (object_is_known(o_ptr))

diff --git a/src/floor-save.c b/src/floor-save.c
index f8e1631..de00a3a 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -677,8 +677,7 @@ static void update_unique_artifact(s16b cur_floor_id)
        {
                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;
 
                /* Memorize location of the artifact */
                if (object_is_fixed_artifact(o_ptr))
@@ -930,8 +929,7 @@ void leave_floor(void)
        {
                object_type *o_ptr = &p_ptr->inventory_list[i];
 
-               /* Skip dead objects */
-               if (!o_ptr->k_idx) continue;
+               if (!OBJECT_IS_VALID(o_ptr)) continue;
 
                /* Delete old memorized location of the artifact */
                if (object_is_fixed_artifact(o_ptr))
@@ -1254,8 +1252,7 @@ void change_floor(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;
 
                                /* Ignore non-artifact */
                                if (!object_is_fixed_artifact(o_ptr)) continue;

diff --git a/src/object-hook.h b/src/object-hook.h
index 013cea7..4d53246 100644 (file)
--- a/src/object-hook.h
+++ b/src/object-hook.h
@@ -68,6 +68,8 @@ extern bool object_is_quest_target(object_type *o_ptr);
   */
 #define object_is_known(T) (((T)->ident & (IDENT_KNOWN)) || (k_info[(T)->k_idx].easy_know && k_info[(T)->k_idx].aware))
 
+#define OBJECT_IS_VALID(T) ((T)->k_idx != 0)
+
 /*
  * Artifacts use the "name1" field
  */

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)

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 94e5ea2..6d5d30e 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -11,6 +11,7 @@
 #include "player-effects.h"
 #include "feature.h"
 #include "view-mainwindow.h"
+#include "object-hook.h"
 
 /*
  * Light up the dungeon using "clairvoyance"
@@ -40,8 +41,7 @@ void wiz_lite(bool ninja)
        {
                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;
@@ -157,8 +157,7 @@ void wiz_dark(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;
 
                /* Skip held objects */
                if (o_ptr->held_m_idx) continue;

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;