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

diff --git a/src/chest.c b/src/chest.c
index b017db3..fe30f3e 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -63,8 +63,6 @@ void chest_death(bool scatter, POSITION y, POSITION x, OBJECT_IDX o_idx)
        {
                /* Get local object */
                q_ptr = &forge;
        {
                /* Get local object */
                q_ptr = &forge;

-
-               /* Wipe the object */

                object_wipe(q_ptr);
 
                /* Small chests often drop gold */
                object_wipe(q_ptr);
 
                /* Small chests often drop gold */

diff --git a/src/cmd4.c b/src/cmd4.c
index c16c8fd..d4551e5 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -6961,8 +6961,6 @@ static void desc_obj_fake(KIND_OBJECT_IDX k_idx)
 
        /* Get local object */
        o_ptr = &object_type_body;
 
        /* Get local object */
        o_ptr = &object_type_body;

-
-       /* Wipe the object */

        object_wipe(o_ptr);
 
        /* Create the artifact */
        object_wipe(o_ptr);
 
        /* Create the artifact */

diff --git a/src/effects.c b/src/effects.c
index 824dd3b..0a0de2c 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -4624,8 +4624,6 @@ void calc_android_exp(void)
 
                if ((i == INVEN_RIGHT) || (i == INVEN_LEFT) || (i == INVEN_NECK) || (i == INVEN_LITE)) continue;
                if (!o_ptr->k_idx) continue;
 
                if ((i == INVEN_RIGHT) || (i == INVEN_LEFT) || (i == INVEN_NECK) || (i == INVEN_LITE)) continue;
                if (!o_ptr->k_idx) continue;

-
-               /* Wipe the object */

                object_wipe(q_ptr);
 
                object_copy(q_ptr, o_ptr);
                object_wipe(q_ptr);
 
                object_copy(q_ptr, o_ptr);

diff --git a/src/load.c b/src/load.c
index d727611..3ce463e 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1402,8 +1402,6 @@ static errr rd_store(int town_number, int store_number)
 
                /* Get local object */
                q_ptr = &forge;
 
                /* Get local object */
                q_ptr = &forge;

-
-               /* Wipe the object */

                object_wipe(q_ptr);
 
                /* Read the item */
                object_wipe(q_ptr);
 
                /* Read the item */


@@ -2402,8 +2400,6 @@ static errr rd_inventory(void)
 
                /* Get local object */
                q_ptr = &forge;
 
                /* Get local object */
                q_ptr = &forge;

-
-               /* Wipe the object */

                object_wipe(q_ptr);
 
                /* Read the item */
                object_wipe(q_ptr);
 
                /* Read the item */

diff --git a/src/object2.c b/src/object2.c
index 40f1d2d..486a6ce 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -206,8 +206,6 @@ void delete_object_idx(OBJECT_IDX o_idx)
                /* Visual update */
                lite_spot(y, x);
        }
                /* Visual update */
                lite_spot(y, x);
        }

-
-       /* Wipe the object */

        object_wipe(j_ptr);
 
        /* Count objects */
        object_wipe(j_ptr);
 
        /* Count objects */


@@ -243,8 +241,6 @@ void delete_object(POSITION y, POSITION x)
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;

-
-               /* Wipe the object */

                object_wipe(o_ptr);
 
                /* Count objects */
                object_wipe(o_ptr);
 
                /* Count objects */


@@ -524,8 +520,6 @@ void wipe_o_list(void)
                        /* Hack -- see above */
                        c_ptr->o_idx = 0;
                }
                        /* Hack -- see above */
                        c_ptr->o_idx = 0;
                }

-
-               /* Wipe the object */

                object_wipe(o_ptr);
        }
 
                object_wipe(o_ptr);
        }
 


@@ -4922,8 +4916,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
 
        /* Get local object */
        q_ptr = &forge;
 
        /* Get local object */
        q_ptr = &forge;

-
-       /* Wipe the object */

        object_wipe(q_ptr);
 
        /* Make an object (if possible) */
        object_wipe(q_ptr);
 
        /* Make an object (if possible) */


@@ -5043,8 +5035,6 @@ void place_gold(POSITION y, POSITION x)
 
        /* Get local object */
        q_ptr = &forge;
 
        /* Get local object */
        q_ptr = &forge;

-
-       /* Wipe the object */

        object_wipe(q_ptr);
 
        /* Make some gold */
        object_wipe(q_ptr);
 
        /* Make some gold */


@@ -5462,8 +5452,6 @@ void acquirement(POSITION y1, POSITION x1, int num, bool great, bool special, bo
        {
                /* Get local object */
                i_ptr = &object_type_body;
        {
                /* Get local object */
                i_ptr = &object_type_body;

-
-               /* Wipe the object */

                object_wipe(i_ptr);
 
                /* Make a good (or great) object (if possible) */
                object_wipe(i_ptr);
 
                /* Make a good (or great) object (if possible) */


@@ -5553,11 +5541,7 @@ void amusement(POSITION y1, POSITION x1, int num, bool known)
 
                /* Get local object */
                i_ptr = &object_type_body;
 
                /* Get local object */
                i_ptr = &object_type_body;

-
-               /* Wipe the object */

                object_wipe(i_ptr);
                object_wipe(i_ptr);

-
-               /* Wipe the object */

                k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
 
                /* Paranoia - reroll if nothing */
                k_idx = lookup_kind(amuse_info[i].tval, amuse_info[i].sval);
 
                /* Paranoia - reroll if nothing */

diff --git a/src/wizard1.c b/src/wizard1.c
index 360a7aa..4185d56 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -1725,8 +1725,6 @@ static void spoil_artifact(cptr fname)
 
                        /* Get local object */
                        q_ptr = &forge;
 
                        /* Get local object */
                        q_ptr = &forge;

-
-                       /* Wipe the object */

                        object_wipe(q_ptr);
 
                        /* Attempt to "forge" the artifact */
                        object_wipe(q_ptr);
 
                        /* Attempt to "forge" the artifact */

diff --git a/src/wizard2.c b/src/wizard2.c
index 594e6c9..61ebcd6 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1107,11 +1107,8 @@ static void wiz_statistics(object_type *o_ptr)
                                Term_fresh();
                        }
 
                                Term_fresh();
                        }
 

-

                        /* Get local object */
                        q_ptr = &forge;
                        /* Get local object */
                        q_ptr = &forge;

-
-                       /* Wipe the object */

                        object_wipe(q_ptr);
 
                        /* Create an object */
                        object_wipe(q_ptr);
 
                        /* Create an object */

diff --git a/src/xtra2.c b/src/xtra2.c
index de4704b..a6ed8e9 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -648,8 +648,6 @@ void check_quest_completion(monster_type *m_ptr)
                {
                        /* Get local object */
                        o_ptr = &forge;
                {
                        /* Get local object */
                        o_ptr = &forge;

-
-                       /* Wipe the object */

                        object_wipe(o_ptr);
 
                        /* Make a great object */
                        object_wipe(o_ptr);
 
                        /* Make a great object */


@@ -953,8 +951,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                {
                        /* Get local object */
                        q_ptr = &forge;
                {
                        /* Get local object */
                        q_ptr = &forge;

-
-                       /* Wipe the object */

                        object_wipe(q_ptr);
 
                        /* Activate restriction */
                        object_wipe(q_ptr);
 
                        /* Activate restriction */


@@ -1138,8 +1134,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
                        {
                                /* Get local object */
                                q_ptr = &forge;

-
-                               /* Wipe the object */

                                object_wipe(q_ptr);
 
                                /* Activate restriction */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */


@@ -1158,8 +1152,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
                        {
                                /* Get local object */
                                q_ptr = &forge;

-
-                               /* Wipe the object */

                                object_wipe(q_ptr);
 
                                /* Activate restriction */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */


@@ -1178,8 +1170,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
                        {
                                /* Get local object */
                                q_ptr = &forge;

-
-                               /* Wipe the object */

                                object_wipe(q_ptr);
 
                                /* Activate restriction */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */


@@ -1198,8 +1188,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
                        {
                                /* Get local object */
                                q_ptr = &forge;

-
-                               /* Wipe the object */

                                object_wipe(q_ptr);
 
                                /* Activate restriction */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */


@@ -1218,8 +1206,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
                        {
                                /* Get local object */
                                q_ptr = &forge;

-
-                               /* Wipe the object */

                                object_wipe(q_ptr);
 
                                /* Activate restriction */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */


@@ -1340,8 +1326,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        {
                /* Get local object */
                q_ptr = &forge;
        {
                /* Get local object */
                q_ptr = &forge;

-
-               /* Wipe the object */

                object_wipe(q_ptr);
 
                /* Make Gold */
                object_wipe(q_ptr);
 
                /* Make Gold */