[Refactor] #37353 型の置換。 / Type replacement

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

diff --git a/src/melee1.c b/src/melee1.c
index 3b578c0..596a8b8 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -116,7 +116,7 @@ HIT_POINT critical_norm(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, BI
  * and which also do at least 20 damage, or, sometimes, N damage.
  * This is used only to determine "cuts" and "stuns".
  */
-static int monster_critical(int dice, int sides, HIT_POINT dam)
+static int monster_critical(DICE_NUMBER dice, DICE_SID sides, HIT_POINT dam)
 {
        int max = 0;
        int total = dice * sides;
@@ -416,7 +416,6 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
        {
                sound(SOUND_MISS);
 
-               /* Message */
                msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name);
        }
 }
@@ -603,7 +602,6 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
 
                        sound(SOUND_HIT);
 
-                       /* Message */
                        if (backstab) msg_format(_("あなたは冷酷にも眠っている無力な%sを突き刺した！", "You cruelly stab the helpless, sleeping %s!"), m_name);
                        else if (fuiuchi) msg_format(_("不意を突いて%sに強烈な一撃を喰らわせた！", "You make surprise attack, and hit %s with a powerful blow!"), m_name);
                        else if (stab_fleeing) msg_format(_("逃げる%sを背中から突き刺した！", "You backstab the fleeing %s!"), m_name);
@@ -1198,9 +1196,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
 
                                sound(SOUND_HIT);
 
-                               /* Message */
                                msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name);
-                               /* Message */
                                msg_print(_("振り回した大鎌が自分自身に返ってきた！", "Your scythe returns to you!"));
 
                                /* Extract the flags */
@@ -1294,7 +1290,6 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
                        {
                                sound(SOUND_MISS);
 
-                               /* Message */
                                msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name);
                        }
                }
@@ -1420,7 +1415,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        /* Handle player fear */
        if (p_ptr->afraid)
        {
-               /* Message */
                if (m_ptr->ml)
                        msg_format(_("恐くて%sを攻撃できない！", "You are too afraid to attack %s!"), m_name);
                else
@@ -1429,7 +1423,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
                /* Disturb the monster */
                (void)set_monster_csleep(c_ptr->m_idx, 0);
 
-               /* Done */
                return FALSE;
        }
 
@@ -1509,7 +1502,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        {
                sound(SOUND_FLEE);
 
-               /* Message */
                msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
        }
 
@@ -1646,7 +1638,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                /* Remember the Evil-ness */
                                if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL;
 
-                               /* Message */
 #ifdef JP
                                if (abbreviate)
                                    msg_format("撃退した。");
@@ -1934,7 +1925,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                }
                        }
 
-                       /* Message */
                        if (act)
                        {
                                if (do_silly_attack)
@@ -2089,7 +2079,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                        /* Don't heal more than max hp */
                                                        heal = MIN(heal, m_ptr->maxhp - m_ptr->hp);
 
-                                                       /* Message */
                                                        msg_print(_("ザックからエネルギーが吸い取られた！", "Energy drains from your pack!"));
 
                                                        /* Obvious */
@@ -2108,10 +2097,8 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                        /* Combine / Reorder the pack */
                                                        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-                                                       /* Window stuff */
                                                        p_ptr->window |= (PW_INVEN);
 
-                                                       /* Done */
                                                        break;
                                                }
                                        }
@@ -2172,7 +2159,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Redraw gold */
                                                p_ptr->redraw |= (PR_GOLD);
 
-                                               /* Window stuff */
                                                p_ptr->window |= (PW_PLAYER);
 
                                                /* Blink away */
@@ -2206,7 +2192,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Obvious */
                                                obvious = TRUE;
 
-                                               /* Done */
                                                break;
                                        }
 
@@ -2230,7 +2215,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Get a description */
                                                object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
 
-                                               /* Message */
 #ifdef JP
                                                msg_format("%s(%c)を%s盗まれた！",
                                                           o_name, index_to_label(i),
@@ -2294,7 +2278,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Blink away */
                                                blinked = TRUE;
 
-                                               /* Done */
                                                break;
                                        }
 
@@ -2326,7 +2309,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Get a description */
                                                object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
-                                               /* Message */
 #ifdef JP
                                                msg_format("%s(%c)を%s食べられてしまった！",
                                                          o_name, index_to_label(i),
@@ -2345,7 +2327,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                /* Obvious */
                                                obvious = TRUE;
 
-                                               /* Done */
                                                break;
                                        }
 
@@ -2376,7 +2357,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                        obvious = TRUE;
                                                }
 
-                                               /* Window stuff */
                                                p_ptr->window |= (PW_EQUIP);
                                        }
 
@@ -2389,7 +2369,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Message */
                                        msg_print(_("酸を浴びせられた！", "You are covered in acid!"));
 
                                        /* Special damage */
@@ -2410,7 +2389,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Message */
                                        msg_print(_("電撃を浴びせられた！", "You are struck by electricity!"));
 
                                        /* Special damage */
@@ -2428,7 +2406,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Message */
                                        msg_print(_("全身が炎に包まれた！", "You are enveloped in flames!"));
 
                                        /* Special damage */
@@ -2446,7 +2423,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Obvious */
                                        obvious = TRUE;
 
-                                       /* Message */
                                        msg_print(_("全身が冷気で覆われた！", "You are covered with frost!"));
 
                                        /* Special damage */
@@ -3358,7 +3334,6 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                        /* Disturbing */
                                        disturb(1, 1);
 
-                                       /* Message */
 #ifdef JP
                                        if (abbreviate)
                                            msg_format("%sかわした。", (p_ptr->special_attack & ATTACK_SUIKEN) ? "奇妙な動きで" : "");