[Refactor] #38836 名称用文字配列のマジックナンバー処理。 / Delete magic number from naming string array.

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

diff --git a/src/melee1.c b/src/melee1.c
index 71f1e13..ca96f81 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -246,7 +246,7 @@ static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_off
 
        if ((atoffset(u32b, r_ptr, flags_offset) & aura_flag) && !immune)
        {
-               GAME_TEXT mon_name[80];
+               GAME_TEXT mon_name[MAX_NLEN];
                int aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
                /* Hack -- Get the "died from" name */
@@ -295,7 +295,7 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath)
        int             n_weight = 0;
        monster_type    *m_ptr = &m_list[m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-       GAME_TEXT m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        int             dice_num, dice_side;
 
@@ -436,7 +436,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b
        /* Access the weapon */
        object_type     *o_ptr = &inventory[INVEN_RARM + hand];
 
-       GAME_TEXT m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        bool            success_hit = FALSE;
        bool            backstab = FALSE;
@@ -1323,7 +1323,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
        cave_type       *c_ptr = &cave[y][x];
        monster_type    *m_ptr = &m_list[c_ptr->m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
-       GAME_TEXT m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        disturb(FALSE, TRUE);
 
@@ -1521,7 +1521,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
        GAME_TEXT o_name[MAX_NLEN];
 
-       GAME_TEXT m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        char ddesc[80];
 
@@ -3233,7 +3233,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
                if (p_ptr->riding && damage)
                {
-                       char m_steed_name[80];
+                       char m_steed_name[MAX_NLEN];
                        monster_desc(m_steed_name, &m_list[p_ptr->riding], 0);
                        if (rakuba((damage > 200) ? 200 : damage, FALSE))
                        {
@@ -3269,7 +3269,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
 
        if ((p_ptr->counter || (p_ptr->special_defense & KATA_MUSOU)) && alive && !p_ptr->is_dead && m_ptr->ml && (p_ptr->csp > 7))
        {
-               char m_target_name[80];
+               char m_target_name[MAX_NLEN];
                monster_desc(m_target_name, m_ptr, 0);
 
                p_ptr->csp -= 7;