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

diff --git a/src/melee1.c b/src/melee1.c
index d1ba640..c5693da 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2072,7 +2072,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                                        /* Combine / Reorder the pack */
                                                        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
                                                        p_ptr->window |= (PW_INVEN);
 
                                                        break;
@@ -2161,9 +2160,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                                                /* Occasional "blink" anyway */
                                                blinked = TRUE;
-
                                                obvious = TRUE;
-
                                                break;
                                        }
 
@@ -2321,18 +2318,10 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        if (explode) break;
                                        obvious = TRUE;
-
                                        msg_print(_("酸を浴びせられた！", "You are covered in acid!"));
-
-                                       /* Special damage */
                                        get_damage += acid_dam(damage, ddesc, -1, FALSE);
-
-                                       /* Hack -- Update AC */
                                        update_stuff();
-
-                                       /* Learn about the player */
                                        update_smart_learn(m_idx, DRS_ACID);
-
                                        break;
                                }
 
@@ -2340,15 +2329,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        if (explode) break;
                                        obvious = TRUE;
-
                                        msg_print(_("電撃を浴びせられた！", "You are struck by electricity!"));
-
-                                       /* Special damage */
                                        get_damage += elec_dam(damage, ddesc, -1, FALSE);
-
-                                       /* Learn about the player */
                                        update_smart_learn(m_idx, DRS_ELEC);
-
                                        break;
                                }
 
@@ -2356,15 +2339,9 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        if (explode) break;
                                        obvious = TRUE;
-
                                        msg_print(_("全身が炎に包まれた！", "You are enveloped in flames!"));
-
-                                       /* Special damage */
                                        get_damage += fire_dam(damage, ddesc, -1, FALSE);
-
-                                       /* Learn about the player */
                                        update_smart_learn(m_idx, DRS_FIRE);
-
                                        break;
                                }
 
@@ -2372,22 +2349,15 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                {
                                        if (explode) break;
                                        obvious = TRUE;
-
                                        msg_print(_("全身が冷気で覆われた！", "You are covered with frost!"));
-
-                                       /* Special damage */
                                        get_damage += cold_dam(damage, ddesc, -1, FALSE);
-
-                                       /* Learn about the player */
                                        update_smart_learn(m_idx, DRS_COLD);
-
                                        break;
                                }
 
                                case RBE_BLIND:
                                {
                                        get_damage += take_hit(DAMAGE_ATTACK, damage, ddesc, -1);
-
                                        if (p_ptr->is_dead) break;
 
                                        /* Increase "blind" */

diff --git a/src/monster-process.c b/src/monster-process.c
index 55eff62..5f42eb5 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -212,7 +212,6 @@ void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note, I
                if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
        }
 
-       /* Wake it up */
        (void)set_monster_csleep(m_idx, 0);
 
        if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(TRUE, TRUE);
@@ -1508,7 +1507,6 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                /* Monster hits */
                if (!effect || check_hit2(power, rlev, ac, MON_STUNNED(m_ptr)))
                {
-                       /* Wake it up */
                        (void)set_monster_csleep(t_idx, 0);
 
                        if (t_ptr->ml)
@@ -1962,7 +1960,6 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                        case RBM_ENGULF:
                        case RBM_CHARGE:
                                {
-                                       /* Wake it up */
                                        (void)set_monster_csleep(t_idx, 0);
 
                                        /* Visible monsters */

diff --git a/src/xtra2.c b/src/xtra2.c
index 582c965..eb73a71 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1552,15 +1552,14 @@ static void get_exp_from_mon(HIT_POINT dam, monster_type *m_ptr)
  */
 bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
 {
-       monster_type    *m_ptr = &m_list[m_idx];
-       monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-
-       monster_type    exp_mon;
+       monster_type *m_ptr = &m_list[m_idx];
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];
+       monster_type exp_mon;
 
        /* Innocent until proven otherwise */
-       bool        innocent = TRUE, thief = FALSE;
-       int         i;
-       int         expdam;
+       bool innocent = TRUE, thief = FALSE;
+       int i;
+       HIT_POINT expdam;
 
        (void)COPY(&exp_mon, m_ptr, monster_type);
        
@@ -1575,7 +1574,6 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
        if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
        if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
 
-       /* Wake it up */
        (void)set_monster_csleep(m_idx, 0);
 
        /* Hack - Cancel any special player stealth magics. -LM- */
@@ -1587,15 +1585,14 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
        /* Genocided by chaos patron */
        if (!m_idx) return TRUE;
        
-       /* Hurt it */
        m_ptr->hp -= dam;
-       
        m_ptr->dealt_damage += dam;
+
        if(m_ptr->dealt_damage > m_ptr->max_maxhp * 100) m_ptr->dealt_damage = m_ptr->max_maxhp * 100;
+
        if (p_ptr->wizard)
        {
-               msg_format( _("合計%d/%dのダメージを与えた。","You do %d (out of %d) damage."),
-                                       m_ptr->dealt_damage, m_ptr->maxhp);
+               msg_format( _("合計%d/%dのダメージを与えた。","You do %d (out of %d) damage."), m_ptr->dealt_damage, m_ptr->maxhp);
        }
 
        /* It is dead now */
@@ -1694,8 +1691,9 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
 
                        /* Dump a message */
                        if (!get_rnd_line(_("mondeath_j.txt", "mondeath.txt"), m_ptr->r_idx, line_got))
-
+                       {
                                msg_format("%^s %s", m_name, line_got);
+                       }
 
 #ifdef WORLD_SCORE
                        if (m_ptr->r_idx == MON_SERPENT)
@@ -1743,8 +1741,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
                        chg_virtue(V_COMPASSION, -1);
                }
 
-               if ((r_ptr->flags3 & RF3_GOOD) &&
-                       ((r_ptr->level) / 10 + (3 * dun_level) >= randint1(100)))
+               if ((r_ptr->flags3 & RF3_GOOD) && ((r_ptr->level) / 10 + (3 * dun_level) >= randint1(100)))
                        chg_virtue(V_UNLIFE, 1);
 
                if (r_ptr->d_char == 'A')
@@ -1801,8 +1798,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
                {
                        if (r_ptr->flags1 & RF1_UNIQUE)
                                chg_virtue(V_JUSTICE, 3);
-                       else if (1+((r_ptr->level) / 10 + (2 * dun_level))
-                               >= randint1(100))
+                       else if (1+((r_ptr->level) / 10 + (2 * dun_level)) >= randint1(100))
                                chg_virtue(V_JUSTICE, 1);
                }
                else if (innocent)
@@ -1818,11 +1814,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
                if ((r_ptr->flags1 & RF1_UNIQUE) && record_destroy_uniq)
                {
                        char note_buf[160];
-#ifdef JP
-                       sprintf(note_buf, "%s%s", r_name + r_ptr->name, (m_ptr->smart & SM_CLONED) ? "(クローン)" : "");
-#else
-                       sprintf(note_buf, "%s%s", r_name + r_ptr->name, (m_ptr->smart & SM_CLONED) ? "(Clone)" : "");
-#endif
+                       sprintf(note_buf, "%s%s", r_name + r_ptr->name, (m_ptr->smart & SM_CLONED) ? _("(クローン)", "(Clone)") : "");
                        do_cmd_write_nikki(NIKKI_UNIQUE, 0, note_buf);
                }
 

diff --git a/src/z-form.c b/src/z-form.c
index f355a98..b2629ba 100644 (file)
--- a/src/z-form.c
+++ b/src/z-form.c
@@ -11,7 +11,6 @@
 /* Purpose: Low level text formatting -BEN- */
 
 #include "z-form.h"
-
 #include "z-util.h"
 #include "z-virt.h"