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

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

diff --git a/src/spells3.c b/src/spells3.c
index f22e7be..89adb98 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1053,7 +1053,6 @@ msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) );
                /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
 
-               /* Window stuff */
                p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
                calc_android_exp();
@@ -1215,7 +1214,6 @@ void brand_weapon(int brand_type)
        item_tester_hook = object_allow_enchant_melee_weapon;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どの武器を強化しますか? ", "Enchant which weapon? ");
        s = _("強化できる武器がない。", "You have nothing to enchant.");
 
@@ -1484,7 +1482,6 @@ static bool vanish_dungeon(void)
        /* Mega-Hack -- Forget the view and lite */
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
 
-       /* Update stuff */
        p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE);
 
        /* Update the monsters */
@@ -1493,7 +1490,6 @@ static bool vanish_dungeon(void)
        /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
-       /* Window stuff */
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
        return TRUE;
@@ -1725,7 +1721,6 @@ void alter_reality(void)
  */
 bool warding_glyph(void)
 {
-       /* XXX XXX XXX */
        if (!cave_clean_bold(p_ptr->y, p_ptr->x))
        {
                msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell."));
@@ -1751,7 +1746,6 @@ bool warding_glyph(void)
  */
 bool place_mirror(void)
 {
-       /* XXX XXX XXX */
        if (!cave_clean_bold(p_ptr->y, p_ptr->x))
        {
                msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell."));
@@ -1784,7 +1778,6 @@ bool place_mirror(void)
  */
 bool explosive_rune(void)
 {
-       /* XXX XXX XXX */
        if (!cave_clean_bold(p_ptr->y, p_ptr->x))
        {
                msg_print(_("床上のアイテムが呪文を跳ね返した。", "The object resists the spell."));
@@ -1900,7 +1893,6 @@ static int remove_curse_aux(int all)
                /* Recalculate the bonuses */
                p_ptr->update |= (PU_BONUS);
 
-               /* Window stuff */
                p_ptr->window |= (PW_EQUIP);
 
                /* Count the uncursings */
@@ -1958,7 +1950,6 @@ bool alchemy(void)
        /* Hack -- force destruction */
        if (command_arg > 0) force = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムを金に変えますか？", "Turn which item to gold? ");
        s = _("金に変えられる物がありません。", "You have nothing to turn to gold.");
 
@@ -2033,7 +2024,6 @@ bool alchemy(void)
                /* Redraw gold */
                p_ptr->redraw |= (PR_GOLD);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
 
        }
@@ -2188,7 +2178,6 @@ bool enchant(object_type *o_ptr, int n, int eflag)
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        calc_android_exp();
@@ -2225,7 +2214,6 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac)
        /* Enchant armor if requested */
        if (num_ac) item_tester_hook = object_is_armour;
 
-       /* Get an item */
        q = _("どのアイテムを強化しますか? ", "Enchant which item? ");
        s = _("強化できるアイテムがない。", "You have nothing to enchant.");
 
@@ -2301,7 +2289,6 @@ bool artifact_scroll(void)
        /* Enchant weapon/armour */
        item_tester_hook = item_tester_hook_nameless_weapon_armour;
 
-       /* Get an item */
        q = _("どのアイテムを強化しますか? ", "Enchant which item? ");
        s = _("強化できるアイテムがない。", "You have nothing to enchant.");
 
@@ -2457,7 +2444,6 @@ bool identify_item(object_type *o_ptr)
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        strcpy(record_o_name, o_name);
@@ -2512,7 +2498,6 @@ bool ident_spell(bool only_equip)
                q = _("すべて鑑定済みです。 ", "All items are identified. ");
        }
 
-       /* Get an item */
        s = _("鑑定するべきアイテムがない。", "You have nothing to identify.");
 
        if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return (FALSE);
@@ -2578,7 +2563,6 @@ bool mundane_spell(bool only_equip)
        if (only_equip) item_tester_hook = object_is_weapon_armour_ammo;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どれを使いますか？", "Use which item? ");
        s = _("使えるものがありません。", "You have nothing you can use.");
 
@@ -2596,7 +2580,6 @@ bool mundane_spell(bool only_equip)
                o_ptr = &o_list[0 - item];
        }
 
-       /* Oops */
        msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!"));
        {
                POSITION iy = o_ptr->iy;                 /* Y-position on map, or zero */
@@ -2659,7 +2642,6 @@ bool identify_fully(bool only_equip)
                q = _("すべて*鑑定*済みです。 ", "All items are *identified*. ");
        }
 
-       /* Get an item */
        s = _("*鑑定*するべきアイテムがない。", "You have nothing to *identify*.");
 
        if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return (FALSE);
@@ -2732,7 +2714,7 @@ bool identify_fully(bool only_equip)
  * strongly they recharge.  Staffs, however, each get fewer charges if
  * stacked.
  *
- * XXX XXX XXX Beware of "sliding index errors".
+ * Beware of "sliding index errors".
  */
 bool recharge(int power)
 {
@@ -2753,7 +2735,6 @@ bool recharge(int power)
        /* Only accept legal items */
        item_tester_hook = item_tester_hook_recharge;
 
-       /* Get an item */
        q = _("どのアイテムに魔力を充填しますか? ", "Recharge which item? ");
        s = _("魔力を充填すべきアイテムがない。", "You have nothing to recharge.");
 
@@ -3014,7 +2995,6 @@ bool recharge(int power)
        /* Combine / Reorder the pack (later) */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 
        /* Something was done */
@@ -3040,7 +3020,6 @@ bool bless_weapon(void)
        /* Bless only weapons */
        item_tester_hook = object_is_weapon;
 
-       /* Get an item */
        q = _("どのアイテムを祝福しますか？", "Bless which weapon? ");
        s = _("祝福できる武器がありません。", "You have weapon to bless.");
 
@@ -3105,7 +3084,6 @@ msg_format("%s から邪悪なオーラが消えた。",
                /* Recalculate the bonuses */
                p_ptr->update |= (PU_BONUS);
 
-               /* Window stuff */
                p_ptr->window |= (PW_EQUIP);
        }
 
@@ -3197,7 +3175,6 @@ msg_format("%s は劣化した！",
        /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
 
-       /* Window stuff */
        p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
        calc_android_exp();
@@ -3223,7 +3200,6 @@ bool pulish_shield(void)
        /* Assume enchant weapon */
        item_tester_tval = TV_SHIELD;
 
-       /* Get an item */
        q = _("どの盾を磨きますか？", "Pulish which weapon? ");
        s = _("磨く盾がありません。", "You have weapon to pulish.");
 
@@ -3453,8 +3429,8 @@ bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_ID
  * Hack -- Display all known spells in a window
  * return なし
  * @details
- * XXX XXX XXX Need to analyze size of the window.
- * XXX XXX XXX Need more color coding.
+ * Need to analyze size of the window.
+ * Need more color coding.
  */
 void display_spell_list(void)
 {
@@ -4490,7 +4466,6 @@ static int minus_ac(void)
        /* Calculate bonuses */
        p_ptr->update |= (PU_BONUS);
 
-       /* Window stuff */
        p_ptr->window |= (PW_EQUIP | PW_PLAYER);
 
        calc_android_exp();
@@ -4710,7 +4685,6 @@ bool rustproof(void)
        /* Select a piece of armour */
        item_tester_hook = object_is_armour;
 
-       /* Get an item */
        q = _("どの防具に錆止めをしますか？", "Rustproof which piece of armour? ");
        s = _("錆止めできるものがありません。", "You have nothing to rustproof.");
 
@@ -4802,7 +4776,6 @@ msg_format("%sが%sを包み込もうとしたが、%sはそれを跳ね返し
        /* not artifact or failed save... */
        else
        {
-               /* Oops */
                msg_format(_("恐怖の暗黒オーラがあなたの%sを包み込んだ！", "A terrible black aura blasts your %s!"), o_name);
                chg_virtue(V_ENCHANT, -5);
 
@@ -4831,7 +4804,6 @@ msg_format("%sが%sを包み込もうとしたが、%sはそれを跳ね返し
                /* Recalculate mana */
                p_ptr->update |= (PU_MANA);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
        }
 
@@ -4872,7 +4844,6 @@ bool curse_weapon_object(bool force, object_type *o_ptr)
        /* not artifact or failed save... */
        else
        {
-               /* Oops */
                if (!force) msg_format(_("恐怖の暗黒オーラがあなたの%sを包み込んだ！", "A terrible black aura blasts your %s!"), o_name);
                chg_virtue(V_ENCHANT, -5);
 
@@ -4901,7 +4872,6 @@ bool curse_weapon_object(bool force, object_type *o_ptr)
                /* Recalculate mana */
                p_ptr->update |= (PU_MANA);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
        }
 
@@ -5223,7 +5193,6 @@ bool eat_magic(int power)
 
        item_tester_hook = item_tester_hook_recharge;
 
-       /* Get an item */
        q = _("どのアイテムから魔力を吸収しますか？", "Drain which item? ");
        s = _("魔力を吸収できるアイテムがありません。", "You have nothing to drain.");