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

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 120cf9c..43cd398 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1011,8 +1011,6 @@ void do_cmd_observe(void)
 
        /* Description */
        object_desc(o_name, o_ptr, 0);
-
-       /* Describe */
        msg_format(_("%sを調べている...", "Examining %s..."), o_name);
        /* Describe it fully */
        if (!screen_object(o_ptr, SCROBJ_FORCE_DETAIL)) msg_print(_("特に変わったところはないようだ。", "You see nothing special."));
@@ -1689,8 +1687,6 @@ void do_cmd_query_symbol(void)
        {
                if (sym == ident_info[i][0]) break;
        }
-
-       /* Describe */
        if (sym == KTRL('A'))
        {
                all = TRUE;

diff --git a/src/cmd4.c b/src/cmd4.c
index 51a7692..c4cd7db 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -2625,8 +2625,6 @@ void do_cmd_macros(void)
        {
                /* Clear screen */
                Term_clear();
-
-               /* Describe */
                prt(_("[ マクロの設定 ]", "Interact with Macros"), 2, 0);
 
                /* Describe that action */

diff --git a/src/dungeon.c b/src/dungeon.c
index e3ecd23..168ea6f 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4614,8 +4614,6 @@ static void pack_overflow(void)
 
                /* Warning */
                msg_print(_("ザックからアイテムがあふれた！", "Your pack overflows!"));
-
-               /* Describe */
                object_desc(o_name, o_ptr, 0);
 
                msg_format(_("%s(%c)を落とした。", "You drop %s (%c)."), o_name, index_to_label(INVEN_PACK));

diff --git a/src/monster1.c b/src/monster1.c
index ae5a39a..f1fc2ce 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -583,8 +583,6 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
                        hooked_roff(format(_("%^sは", "%^s "), wd_he[msex]));
                        old = TRUE;
                }
-
-               /* Describe */
                hooked_roff(_("侵入者を追跡しない", "does not deign to chase intruders"));
        }
 

diff --git a/src/object1.c b/src/object1.c
index 5767b77..e3a0068 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2546,8 +2546,6 @@ static bool verify(cptr prompt, INVENTORY_IDX item)
        {
                o_ptr = &o_list[0 - item];
        }
-
-       /* Describe */
        object_desc(o_name, o_ptr, 0);
 
        /* Prompt */

diff --git a/src/object2.c b/src/object2.c
index 3992b20..40f1d2d 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6536,8 +6536,6 @@ void display_koff(KIND_OBJECT_IDX k_idx)
 
        /* Prepare the object */
        object_prep(q_ptr, k_idx);
-
-       /* Describe */
        object_desc(o_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY | OD_STORE));
 
        /* Mention the object name */

diff --git a/src/player-damage.c b/src/player-damage.c
index ff03e4b..77d850d 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -359,9 +359,6 @@ static bool minus_ac(void)
 
        /* No damage left to be done */
        if (o_ptr->ac + o_ptr->to_a <= 0) return (FALSE);
-
-
-       /* Describe */
        object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
        /* Extract the flags */

diff --git a/src/spells2.c b/src/spells2.c
index 4ed65b0..d8c446d 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -88,8 +88,6 @@ bool detect_traps(POSITION range, bool known)
        if (known) p_ptr->dtrap = TRUE;
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!"));
@@ -108,8 +106,6 @@ bool detect_doors(POSITION range)
        bool detect = detect_feat_flag(range, FF_DOOR, TRUE);
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!"));
@@ -128,8 +124,6 @@ bool detect_stairs(POSITION range)
        bool detect = detect_feat_flag(range, FF_STAIRS, TRUE);
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 0) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!"));
@@ -148,8 +142,6 @@ bool detect_treasure(POSITION range)
        bool detect = detect_feat_flag(range, FF_HAS_GOLD, TRUE);
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!"));
@@ -199,8 +191,6 @@ bool detect_objects_gold(POSITION range)
        }
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("財宝の存在を感じとった！", "You sense the presence of treasure!"));
@@ -255,8 +245,6 @@ bool detect_objects_normal(POSITION range)
        }
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 6) detect = FALSE;
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("アイテムの存在を感じとった！", "You sense the presence of objects!"));
@@ -343,8 +331,6 @@ bool detect_objects_magic(POSITION range)
                        detect = TRUE;
                }
        }
-
-       /* Describe */
        if (detect)
        {
                msg_print(_("魔法のアイテムの存在を感じとった！", "You sense the presence of magic objects!"));
@@ -400,8 +386,6 @@ bool detect_monsters_normal(POSITION range)
        }
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -461,8 +445,6 @@ bool detect_monsters_invis(POSITION range)
        }
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -525,8 +507,6 @@ bool detect_monsters_evil(POSITION range)
                        flag = TRUE;
                }
        }
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -583,8 +563,6 @@ bool detect_monsters_nonliving(POSITION range)
                        flag = TRUE;
                }
        }
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -641,8 +619,6 @@ bool detect_monsters_mind(POSITION range)
                        flag = TRUE;
                }
        }
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -703,8 +679,6 @@ bool detect_monsters_string(POSITION range, cptr Match)
        }
 
        if (music_singing(MUSIC_DETECT) && SINGING_COUNT(p_ptr) > 3) flag = FALSE;
-
-       /* Describe */
        if (flag)
        {
                /* Describe result */
@@ -769,8 +743,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag)
                        flag = TRUE;
                }
        }
-
-       /* Describe */
        if (flag)
        {
                switch (match_flag)

diff --git a/src/spells3.c b/src/spells3.c
index 1359bac..88fb914 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2224,8 +2224,6 @@ bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac)
 
        /* Description */
        object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-
-       /* Describe */
 #ifdef JP
 msg_format("%s は明るく輝いた！",
     o_name);
@@ -2299,8 +2297,6 @@ bool artifact_scroll(void)
 
        /* Description */
        object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-
-       /* Describe */
 #ifdef JP
        msg_format("%s は眩い光を発した！",o_name);
 #else
@@ -2509,8 +2505,6 @@ bool ident_spell(bool only_equip)
 
        /* Description */
        object_desc(o_name, o_ptr, 0);
-
-       /* Describe */
        if (item >= INVEN_RARM)
        {
                msg_format(_("%^s: %s(%c)。", "%^s: %s (%c)."), describe_use(item), o_name, index_to_label(item));
@@ -2659,8 +2653,6 @@ bool identify_fully(bool only_equip)
 
        /* Description */
        object_desc(o_name, o_ptr, 0);
-
-       /* Describe */
        if (item >= INVEN_RARM)
        {
                msg_format(_("%^s: %s(%c)。", "%^s: %s (%c)."), describe_use(item), o_name, index_to_label(item));
@@ -3101,10 +3093,8 @@ msg_format("%s は既に祝福されている。",
 
        if (!(object_is_artifact(o_ptr) || object_is_ego(o_ptr)) || one_in_(3))
        {
-               /* Describe */
 #ifdef JP
-msg_format("%sは輝いた！",
-     o_name);
+               msg_format("%sは輝いた！", o_name);
 #else
                msg_format("%s %s shine%s!",
                    ((item >= 0) ? "Your" : "The"), o_name,
@@ -4146,8 +4136,6 @@ bool curse_armor(void)
        /* Nothing to curse */
        if (!o_ptr->k_idx) return (FALSE);
 
-
-       /* Describe */
        object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
 
        /* Attempt a saving throw for artifacts */
@@ -4215,8 +4203,6 @@ bool curse_weapon_object(bool force, object_type *o_ptr)
 
        /* Nothing to curse */
        if (!o_ptr->k_idx) return (FALSE);
-
-       /* Describe */
        object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
 
        /* Attempt a saving throw */

diff --git a/src/store.c b/src/store.c
index f169c6e..ca46ca2 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -4166,8 +4166,6 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price);
 
                /* Distribute charges of wands/rods */
                distribute_charges(o_ptr, q_ptr, amt);
-
-               /* Describe */
 #ifdef JP
                msg_format("%sを置いた。(%c)", o_name, index_to_label(item));
 #else
@@ -4199,8 +4197,6 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price);
        {
                /* Distribute charges of wands/rods */
                distribute_charges(o_ptr, q_ptr, amt);
-
-               /* Describe */
 #ifdef JP
                msg_format("%sを置いた。(%c)", o_name, index_to_label(item));
 #else
@@ -4316,8 +4312,6 @@ msg_print("このアイテムについて特に知っていることはない。
 
        /* Description */
        object_desc(o_name, o_ptr, 0);
-
-       /* Describe */
 #ifdef JP
 msg_format("%sを調べている...", o_name);
 #else