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

diff --git a/src/dungeon.c b/src/dungeon.c
index d8d7797..a824062 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1363,7 +1363,6 @@ static void process_world_aux_digestion(void)
                                /* Calculate damage */
                                HIT_POINT dam = (PY_FOOD_STARVE - p_ptr->food) / 10;
 
-                               /* Take damage */
                                if (!IS_INVULN()) take_hit(DAMAGE_LOSELIFE, dam, _("空腹", "starvation"), -1);
                        }
                }
@@ -1390,7 +1389,6 @@ static void process_world_aux_hp_and_sp(void)
        /* Take damage from poison */
        if (p_ptr->poisoned && !IS_INVULN())
        {
-               /* Take damage */
                take_hit(DAMAGE_NOESCAPE, 1, _("毒", "poison"), -1);
        }
 
@@ -1437,7 +1435,6 @@ static void process_world_aux_hp_and_sp(void)
                        dam = 1;
                }
 
-               /* Take damage */
                take_hit(DAMAGE_NOESCAPE, dam, _("致命傷", "a fatal wound"), -1);
        }
 
@@ -1448,7 +1445,6 @@ static void process_world_aux_hp_and_sp(void)
                {
                        if ((cave[p_ptr->y][p_ptr->x].info & (CAVE_GLOW | CAVE_MNDK)) == CAVE_GLOW)
                        {
-                               /* Take damage */
                                msg_print(_("日光があなたのアンデッドの肉体を焼き焦がした！", "The sun's rays scorch your undead flesh!"));
                                take_hit(DAMAGE_NOESCAPE, 1, _("日光", "sunlight"), -1);
                                cave_no_regen = TRUE;
@@ -1520,7 +1516,6 @@ static void process_world_aux_hp_and_sp(void)
        {
                if (p_ptr->total_weight > weight_limit())
                {
-                       /* Take damage */
                        msg_print(_("溺れている！", "You are drowning!"));
                        take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->lev), _("溺れ", "drowning"), -1);
                        cave_no_regen = TRUE;

diff --git a/src/melee1.c b/src/melee1.c
index a6b87df..6c85868 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1981,7 +1981,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                msg_print(_("痛恨の一撃！", "It was a critical hit!"));
                                                tmp_damage = MAX(damage, tmp_damage*2);
 
-                                               /* Take damage */
                                                get_damage += take_hit(DAMAGE_ATTACK, tmp_damage, ddesc, -1);
                                                break;
                                        }
@@ -1994,7 +1993,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Hack -- Player armor reduces total damage */
                                        damage -= (damage * ((ac < 150) ? ac : 150) / 250);
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        break;
@@ -2435,7 +2433,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_BLIND:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2463,7 +2460,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                case RBE_CONFUSE:
                                {
                                        if (explode) break;
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2485,7 +2481,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_TERRIFY:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2521,7 +2516,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                case RBE_PARALYZE:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2662,7 +2656,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Hack -- Reduce damage based on the player armor class */
                                        damage -= (damage * ((ac < 150) ? ac : 150) / 250);
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        /* Radius 8 earthquake centered at the monster */
@@ -2681,7 +2674,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2697,7 +2689,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2713,7 +2704,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2729,7 +2719,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2840,7 +2829,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead || CHECK_MULTISHADOW()) break;
@@ -2905,7 +2893,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        {
                                                do_cut = 0;
 
-                                               /* Take damage */
                                                p_ptr->csp -= damage;
                                                if (p_ptr->csp < 0)
                                                {
@@ -2923,7 +2910,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_INERTIA:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;
@@ -2945,7 +2931,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                                case RBE_STUN:
                                {
-                                       /* Take damage */
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
 
                                        if (p_ptr->is_dead) break;

diff --git a/src/player-damage.c b/src/player-damage.c
index 46bb1e6..936578c 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -433,7 +433,6 @@ HIT_POINT acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
                if (minus_ac()) dam = (dam + 1) / 2;
        }
 
-       /* Take damage */
        get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
 
        /* Inventory damage */
@@ -481,7 +480,6 @@ HIT_POINT elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
                        (void)do_dec_stat(A_DEX);
        }
 
-       /* Take damage */
        get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
 
        /* Inventory damage */
@@ -530,7 +528,6 @@ HIT_POINT fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
                        (void)do_dec_stat(A_STR);
        }
 
-       /* Take damage */
        get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
 
        /* Inventory damage */
@@ -578,7 +575,6 @@ HIT_POINT cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura)
                        (void)do_dec_stat(A_STR);
        }
 
-       /* Take damage */
        get_damage = take_hit(aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
 
        /* Inventory damage */

diff --git a/src/spells2.c b/src/spells2.c
index b526bec..4ea4451 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1116,7 +1116,6 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
 
        if (player_cast)
        {
-               /* Take damage */
                take_hit(DAMAGE_GENO, randint1(dam_side), format(_("%^sの呪文を唱えた疲労", "the strain of casting %^s"), spell_name), -1);
        }