[Refactor] #37353 snipe_type をグローバル変数から、引数へ置換 / Replace snipe_type from global to...

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

diff --git a/src/object1.c b/src/object1.c
index 0a22c87..f90a0d0 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2844,8 +2844,6 @@ bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode)
                {
                        object_type *o_ptr;
                        o_ptr = &current_floor_ptr->o_list[this_o_idx];
-
-                       /* Acquire next object */
                        next_o_idx = o_ptr->next_o_idx;
 
                        /* Accept the item on the floor if legal */
@@ -3194,8 +3192,6 @@ bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode)
                                        {
                                                object_type *o_ptr;
                                                o_ptr = &current_floor_ptr->o_list[this_o_idx];
-
-                                               /* Acquire next object */
                                                next_o_idx = o_ptr->next_o_idx;
 
                                                /* Validate the item */
@@ -3488,8 +3484,6 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode
        {
                object_type *o_ptr;
                o_ptr = &current_floor_ptr->o_list[this_o_idx];
-
-               /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
 
                /* Item tester */
@@ -4854,7 +4848,6 @@ void py_pickup_floor(bool pickup)
                /* Access the next object */
                next_o_idx = o_ptr->next_o_idx;
 
-               /* Hack -- disturb */
                disturb(FALSE, FALSE);
 
                /* Pick up gold */
@@ -5047,7 +5040,7 @@ void py_pickup_floor(bool pickup)
  * @details
  * Note that artifacts never break, see the "drop_near()" function.
  */
-PERCENTAGE breakage_chance(object_type *o_ptr)
+PERCENTAGE breakage_chance(object_type *o_ptr, SPELL_IDX snipe_type)
 {
        PERCENTAGE archer_bonus = (p_ptr->pclass == CLASS_ARCHER ? (PERCENTAGE)(p_ptr->lev - 1) / 7 + 4 : 0);