[Refactor] #37353 メッセージ整理。

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

diff --git a/src/object2.c b/src/object2.c
index 691284d..d486eb3 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -376,7 +376,6 @@ void compact_objects(int size)
                /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
        }
 
@@ -590,7 +589,6 @@ OBJECT_IDX o_pop(void)
        /* Warn the player (except during dungeon creation) */
        if (character_dungeon) msg_print(_("アイテムが多すぎる！", "Too many objects!"));
 
-       /* Oops */
        return (0);
 }
 
@@ -1543,7 +1541,6 @@ bool can_player_destroy_object(object_type *o_ptr)
                /* Combine the pack */
                p_ptr->notice |= (PN_COMBINE);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                return FALSE;
@@ -1906,8 +1903,8 @@ void object_absorb(object_type *o_ptr, object_type *j_ptr)
        /* Hack -- blend "feelings" */
        if (j_ptr->feeling) o_ptr->feeling = j_ptr->feeling;
 
-       /* Hack -- could average discounts XXX XXX XXX */
-       /* Hack -- save largest discount XXX XXX XXX */
+       /* Hack -- could average discounts */
+       /* Hack -- save largest discount */
        if (o_ptr->discount < j_ptr->discount) o_ptr->discount = j_ptr->discount;
 
        /* Hack -- if rods are stacking, add the pvals (maximum timeouts) and current timeouts together. -LM- */
@@ -1966,12 +1963,10 @@ IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval)
        }
 
 #if 0
-       /* Oops */
        msg_format(_("アイテムがない (%d,%d)", "No object (%d,%d)"), tval, sval);
 #endif
 
 
-       /* Oops */
        return (0);
 }
 
@@ -5743,7 +5738,6 @@ void inven_item_increase(INVENTORY_IDX item, int num)
                /* Combine the pack */
                p_ptr->notice |= (PN_COMBINE);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                /* Hack -- Clear temporary elemental brands if player takes off weapons */
@@ -5795,7 +5789,6 @@ void inven_item_optimize(INVENTORY_IDX item)
                /* Erase the "final" slot */
                object_wipe(&inventory[i]);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN);
        }
 
@@ -5817,11 +5810,9 @@ void inven_item_optimize(INVENTORY_IDX item)
                /* Recalculate mana XXX */
                p_ptr->update |= (PU_MANA);
 
-               /* Window stuff */
                p_ptr->window |= (PW_EQUIP);
        }
 
-       /* Window stuff */
        p_ptr->window |= (PW_SPELL);
 }
 
@@ -6116,7 +6107,6 @@ s16b inven_carry(object_type *o_ptr)
                        /* Recalculate bonuses */
                        p_ptr->update |= (PU_BONUS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_INVEN);
 
                        /* Success */
@@ -6198,7 +6188,6 @@ s16b inven_carry(object_type *o_ptr)
        /* Combine and Reorder pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 
        /* Return the slot */
@@ -6457,7 +6446,6 @@ void combine_pack(void)
                                                }
                                        }
 
-                                       /* Window stuff */
                                        p_ptr->window |= (PW_INVEN);
 
                                        /* Take note */
@@ -6533,7 +6521,6 @@ void reorder_pack(void)
                /* Insert the moving item */
                object_copy(&inventory[j], q_ptr);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN);
        }
 
@@ -7638,7 +7625,6 @@ static void drain_essence(void)
        item_tester_hook = object_is_weapon_armour_ammo;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムから抽出しますか？", "Extract from which item? ");
        s = _("抽出できるアイテムがありません。", "You have nothing you can extract from.");
 
@@ -7850,7 +7836,6 @@ static void drain_essence(void)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }
 
@@ -8258,7 +8243,6 @@ static void add_essence(ESSENCE_IDX mode)
                item_tester_hook = object_is_weapon_armour_ammo;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムを改良しますか？", "Improve which item? ");
        s = _("改良できるアイテムがありません。", "You have nothing to improve.");
 
@@ -8479,7 +8463,6 @@ static void add_essence(ESSENCE_IDX mode)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }
 
@@ -8497,7 +8480,6 @@ static void erase_essence(void)
 
        item_tester_hook = object_is_smith;
 
-       /* Get an item */
        q = _("どのアイテムのエッセンスを消去しますか？", "Remove from which item? ");
        s = _("エッセンスを付加したアイテムがありません。", "You have nothing to remove essence.");
 
@@ -8536,7 +8518,6 @@ static void erase_essence(void)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }