Changed to match the For2.2.2-Refactoring-Cocoa2 branch. Put se_maoudamashii_voice_m...

[hengbandforosx/hengbandosx.git] / src / object1.c

diff --git a/src/object1.c b/src/object1.c
index 0a22c87..f760e26 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -429,8 +429,8 @@ static concptr item_activation_aux(object_type *o_ptr)
        constant = act_ptr->timeout.constant;
        dice = act_ptr->timeout.dice;
        if (constant == 0 && dice == 0) {
-               /* We can activate it every current_world_ptr->game_turn */
-               strcpy(timeout, _("いつでも", "every current_world_ptr->game_turn"));
+               /* We can activate it every turn */
+               strcpy(timeout, _("いつでも", "every turn"));
        } else if (constant < 0) {
                /* Activations that have special timeout */
                switch (act_ptr->index) {
@@ -559,7 +559,7 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
        /* Figurines, a hack */
        if (o_ptr->name1 == ART_STONEMASK)
        {
-               info[i++] = _("それを装備した者は吸血鬼になる。", "It makes you current_world_ptr->game_turn into a vampire permanently.");
+               info[i++] = _("それを装備した者は吸血鬼になる。", "It makes you turn into a vampire permanently.");
        }
 
        if ((o_ptr->tval == TV_SWORD) && (o_ptr->sval == SV_DOKUBARI))
@@ -2189,9 +2189,7 @@ COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode)
        /* Output each entry */
        for (j = 0; j < k; j++)
        {
-               /* Get the index */
                i = out_index[j];
-
                o_ptr = &inventory[i];
 
                /* Clear the line */
@@ -2361,9 +2359,7 @@ COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode)
        /* Output each entry */
        for (j = 0; j < k; j++)
        {
-               /* Get the index */
                i = out_index[j];
-
                o_ptr = &inventory[i];
 
                /* Clear the line */
@@ -2383,7 +2379,7 @@ COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode)
                        /* Prepare an index --(-- */
                        sprintf(tmp_val, "%c)", equip_label[i - INVEN_RARM]);
                }
-               else /* Paranoia */
+               else
                {
                        /* Prepare an index --(-- */
                        sprintf(tmp_val, "%c)", index_to_label(i));
@@ -2781,8 +2777,6 @@ bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode)
                        }
                }
        }
-
-       /* Paranoia */
        msg_print(NULL);
 
        /* Not done */
@@ -2844,8 +2838,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 +3186,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 +3478,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 */
@@ -3596,9 +3584,7 @@ COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_w
        /* Output each entry */
        for (j = 0; j < k; j++)
        {
-               /* Get the index */
                m = floor_list[out_index[j]];
-
                o_ptr = &current_floor_ptr->o_list[m];
 
                /* Clear the line */
@@ -3785,8 +3771,6 @@ bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode)
                }
        }
 
-
-       /* Paranoia */
        msg_print(NULL);
 
 
@@ -4854,7 +4838,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 +5030,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);