[Refactor] #37353 コメント整理 / Refactor comments.

diff --git a/src/autopick.c b/src/autopick.c
index 4842360..8d60e03 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1706,9 +1706,7 @@ void autopick_pickup_items(cave_type *c_ptr)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                int idx;
-       
-               /* Acquire object */
-               object_type *o_ptr = &o_list[this_o_idx];
+                       object_type *o_ptr = &o_list[this_o_idx];
                
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;

diff --git a/src/cave.c b/src/cave.c
index 2dc97dc..265d50a 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -626,8 +626,6 @@ bool cave_valid_bold(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -1195,8 +1193,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap,
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */

diff --git a/src/cmd1.c b/src/cmd1.c
index a8c07d4..76b1d32 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -386,8 +386,6 @@ static void discover_hidden_things(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -575,8 +573,6 @@ void carry(bool pickup)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
 #ifdef ALLOW_EASY_SENSE /* TNB */
@@ -1815,8 +1811,6 @@ static bool run_test(void)
                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */

diff --git a/src/cmd4.c b/src/cmd4.c
index c34eb7a..ef50108 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5403,8 +5403,6 @@ static void do_cmd_knowledge_artifacts(void)
                        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                        {
                                object_type *o_ptr;
-
-                               /* Acquire object */
                                o_ptr = &o_list[this_o_idx];
 
                                /* Acquire next object */

diff --git a/src/floor-streams.c b/src/floor-streams.c
index a172727..254e9b6 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -293,7 +293,6 @@ void build_streamer(IDX feat, int chance)
                                /* Scan all objects in the grid */
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                                {
-                                       /* Acquire object */
                                        object_type *o_ptr = &o_list[this_o_idx];
 
                                        /* Acquire next object */

diff --git a/src/monster-process.c b/src/monster-process.c
index 5f42eb5..4d04039 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3099,8 +3099,6 @@ void process_monster(MONSTER_IDX m_idx)
                                {
                                        BIT_FLAGS flgs[TR_FLAG_SIZE], flg2 = 0L, flg3 = 0L, flgr = 0L;
                                        char m_name[80], o_name[MAX_NLEN];
-
-                                       /* Acquire object */
                                        object_type *o_ptr = &o_list[this_o_idx];
 
                                        /* Acquire next object */

diff --git a/src/monster2.c b/src/monster2.c
index 05ead33..7e40dfb 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -266,8 +266,6 @@ void delete_monster_idx(MONSTER_IDX i)
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -354,8 +352,6 @@ static void compact_monsters_aux(IDX i1, IDX i2)
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -4557,7 +4553,6 @@ void monster_drop_carried_objects(monster_type *m_ptr)
        /* Drop objects being carried */
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */

diff --git a/src/mspells1.c b/src/mspells1.c
index 24f3f4a..70d5ef1 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -415,7 +415,6 @@ bool raise_possible(monster_type *m_ptr)
                        /* Scan the pile of objects */
                        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                        {
-                               /* Acquire object */
                                object_type *o_ptr = &o_list[this_o_idx];
 
                                /* Acquire next object */

diff --git a/src/object1.c b/src/object1.c
index 35f1c31..a472034 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2766,8 +2766,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
 
                        /* Special index */
                        k = 0 - (*cp);
-
-                       /* Acquire object */
                        o_ptr = &o_list[k];
 
                        /* Validate the item */
@@ -2886,8 +2884,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
                for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -3253,8 +3249,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
                                        for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
                                        {
                                                object_type *o_ptr;
-
-                                               /* Acquire object */
                                                o_ptr = &o_list[this_o_idx];
 
                                                /* Acquire next object */
@@ -3535,8 +3529,6 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode
        for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */

diff --git a/src/object2.c b/src/object2.c
index 0264df0..33859fd 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -81,8 +81,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
                for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -135,8 +133,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                {
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -233,8 +229,6 @@ void delete_object(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -272,7 +266,6 @@ static void compact_objects_aux(OBJECT_IDX i1, OBJECT_IDX i2)
        /* Repair objects */
        for (i = 1; i < o_max; i++)
        {
-               /* Acquire object */
                o_ptr = &o_list[i];
 
                /* Skip "dead" objects */
@@ -285,8 +278,6 @@ static void compact_objects_aux(OBJECT_IDX i1, OBJECT_IDX i2)
                        o_ptr->next_o_idx = i2;
                }
        }
-
-       /* Acquire object */
        o_ptr = &o_list[i1];
 
        /* Monster */
@@ -554,8 +545,6 @@ OBJECT_IDX o_pop(void)
        for (i = 1; i < o_max; i++)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[i];
 
                /* Skip live objects */
@@ -4919,8 +4908,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
        if (o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[o_idx];
 
                /* Structure Copy */
@@ -5036,8 +5023,6 @@ void place_gold(POSITION y, POSITION x)
        if (o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[o_idx];
 
                /* Copy the object */
@@ -5172,8 +5157,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
                        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                        {
                                object_type *o_ptr;
-
-                               /* Acquire object */
                                o_ptr = &o_list[this_o_idx];
 
                                /* Acquire next object */
@@ -5326,8 +5309,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */

diff --git a/src/spells1.c b/src/spells1.c
index c6bbc83..c3e299e 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1284,7 +1284,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        /* Scan all objects in the grid */
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                object_type *o_ptr = &o_list[this_o_idx];
 
                bool is_art = FALSE;

diff --git a/src/spells2.c b/src/spells2.c
index f3d67e7..ff294f5 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -964,8 +964,7 @@ void aggravate_monsters(MONSTER_IDX who)
        /* Aggravate everyone nearby */
        for (i = 1; i < m_max; i++)
        {
-               monster_type    *m_ptr = &m_list[i];
-/*             monster_race    *r_ptr = &r_info[m_ptr->r_idx]; */
+               monster_type *m_ptr = &m_list[i];
 
                /* Paranoia -- Skip dead monsters */
                if (!m_ptr->r_idx) continue;
@@ -1477,8 +1476,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                                for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
                                {
                                        object_type *o_ptr;
-
-                                       /* Acquire object */
                                        o_ptr = &o_list[this_o_idx];
 
                                        /* Acquire next object */

diff --git a/src/spells3.c b/src/spells3.c
index 92afc06..ab1d7e3 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -4426,7 +4426,6 @@ bool polymorph_monster(POSITION y, POSITION x)
                {
                        for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
                        {
-                               /* Acquire object */
                                object_type *o_ptr = &o_list[this_o_idx];
 
                                /* Acquire next object */

diff --git a/src/xtra1.c b/src/xtra1.c
index 1ef756d..fcb013a 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -5724,7 +5724,6 @@ void calc_bonuses(void)
 
        for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */

diff --git a/src/xtra2.c b/src/xtra2.c
index 11c0fbc..ea8de97 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2719,8 +2719,6 @@ static bool target_set_accept(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -3089,8 +3087,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        char o_name[MAX_NLEN];
 
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -3139,8 +3135,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                                char o_name[MAX_NLEN];
 
                                object_type *o_ptr;
-
-                               /* Acquire object */
                                o_ptr = &o_list[floor_list[0]];
 
                                object_desc(o_name, o_ptr, 0);
@@ -3241,8 +3235,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */