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

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

diff --git a/src/spells3.c b/src/spells3.c
index 6c01044..92afc06 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -118,7 +118,7 @@ bool teleport_away(MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode)
        reset_target(m_ptr);
 
        /* Update the monster (new location) */
-       update_mon(m_idx, TRUE);
+       update_monster(m_idx, TRUE);
 
        /* Redraw the old grid */
        lite_spot(oy, ox);
@@ -223,7 +223,7 @@ void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power,
        m_ptr->fx = nx;
 
        /* Update the monster (new location) */
-       update_mon(m_idx, TRUE);
+       update_monster(m_idx, TRUE);
 
        /* Redraw the old grid */
        lite_spot(oy, ox);
@@ -973,7 +973,6 @@ bool apply_disenchant(BIT_FLAGS mode)
                case 8: t = INVEN_FEET; break;
        }
 
-       /* Get the item */
        o_ptr = &inventory[t];
 
        /* No item, nothing happens */
@@ -991,7 +990,6 @@ bool apply_disenchant(BIT_FLAGS mode)
        }
 
 
-       /* Describe the object */
        object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
 
@@ -1182,7 +1180,6 @@ void phlogiston(void)
 
        msg_print(_("照明用アイテムに燃素を補充した。", "You add phlogiston to your light item."));
 
-       /* Comment */
        if (o_ptr->xtra4 >= max_flog)
        {
                o_ptr->xtra4 = (XTRA16)max_flog;
@@ -1484,7 +1481,6 @@ static bool vanish_dungeon(void)
        /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1730,7 +1726,6 @@ bool warding_glyph(void)
 
        note_spot(p_ptr->y, p_ptr->x);
 
-       /* Redraw */
        lite_spot(p_ptr->y, p_ptr->x);
 
        return TRUE;
@@ -1757,7 +1752,6 @@ bool place_mirror(void)
 
        note_spot(p_ptr->y, p_ptr->x);
 
-       /* Redraw */
        lite_spot(p_ptr->y, p_ptr->x);
 
        update_local_illumination(p_ptr->y, p_ptr->x);
@@ -1785,7 +1779,6 @@ bool explosive_rune(void)
 
        note_spot(p_ptr->y, p_ptr->x);
        
-       /* Redraw */
        lite_spot(p_ptr->y, p_ptr->x);
 
        return TRUE;
@@ -1973,7 +1966,6 @@ bool alchemy(void)
        }
 
 
-       /* Describe the object */
        old_number = o_ptr->number;
        o_ptr->number = amt;
        object_desc(o_name, o_ptr, 0);
@@ -2228,11 +2220,8 @@ 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);
+       msg_format("%s は明るく輝いた！", o_name);
 #else
        msg_format("%s %s glow%s brightly!",
                   ((item >= 0) ? "Your" : "The"), o_name,
@@ -2248,11 +2237,8 @@ msg_format("%s は明るく輝いた！",
        /* Failure */
        if (!okay)
        {
-               /* Flush */
                if (flush_failure) flush();
-
                msg_print(_("強化に失敗した。", "The enchantment failed."));
-
                if (one_in_(3)) chg_virtue(V_ENCHANT, -1);
        }
        else
@@ -2303,8 +2289,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
@@ -2377,18 +2361,14 @@ bool artifact_scroll(void)
        /* Failure */
        if (!okay)
        {
-               /* Flush */
                if (flush_failure) flush();
-
                msg_print(_("強化に失敗した。", "The enchantment failed."));
-
                if (one_in_(3)) chg_virtue(V_ENCHANT, -1);
        }
        else
        {
                if (record_rand_art)
                {
-                       /* Description */
                        object_desc(o_name, o_ptr, OD_NAME_ONLY);
                        do_cmd_write_nikki(NIKKI_ART_SCROLL, 0, o_name);
                }
@@ -2513,8 +2493,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));
@@ -2663,8 +2641,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));
@@ -3105,10 +3081,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,
@@ -4150,8 +4124,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 */
@@ -4219,8 +4191,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 */
@@ -4318,14 +4288,10 @@ bool brand_bolts(void)
 
                /* Ego-item */
                o_ptr->name2 = EGO_FLAME;
-
-               /* Enchant */
                enchant(o_ptr, randint0(3) + 4, ENCH_TOHIT | ENCH_TODAM);
-
                return (TRUE);
        }
 
-       /* Flush */
        if (flush_failure) flush();
 
        /* Fail */
@@ -4478,7 +4444,6 @@ bool polymorph_monster(POSITION y, POSITION x)
                                /* Acquire next object */
                                next_o_idx = o_list[this_o_idx].next_o_idx;
 
-                               /* Delete the object */
                                delete_object_idx(this_o_idx);
                        }
                }
@@ -5098,7 +5063,7 @@ bool shock_power(void)
                                m_ptr->fy = (byte_hack)ty;
                                m_ptr->fx = (byte_hack)tx;
 
-                               update_mon(m_idx, TRUE);
+                               update_monster(m_idx, TRUE);
                                lite_spot(oy, ox);
                                lite_spot(ty, tx);