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

[hengband/hengband.git] / src / monster-status.c

diff --git a/src/monster-status.c b/src/monster-status.c
index e63a7f7..bddd27e 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -480,12 +480,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                                        /* Notice the "waking up" */
                                        if (m_ptr->ml)
                                        {
-                                               char m_name[80];
-
-                                               /* Acquire the monster name */
+                                               GAME_TEXT m_name[MAX_NLEN];
                                                monster_desc(m_name, m_ptr, 0);
-
-                                               /* Dump a message */
                                                msg_format(_("%^sが目を覚ました。", "%^s wakes up."), m_name);
                                        }
 
@@ -506,12 +502,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
-
-                               /* Acquire the monster name */
+                               GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
                                msg_format(_("%^sはもう加速されていない。", "%^s is no longer fast."), m_name);
                        }
                }
@@ -523,12 +515,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
-
-                               /* Acquire the monster name */
+                               GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
                                msg_format(_("%^sはもう減速されていない。", "%^s is no longer slow."), m_name);
                        }
                }
@@ -544,12 +532,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Message if visible */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
-
-                               /* Acquire the monster name */
+                               GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
                                msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
                        }
                }
@@ -563,12 +547,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Message if visible */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
-
-                               /* Acquire the monster name */
+                               GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
                                msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
                        }
                }
@@ -581,18 +561,14 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                        /* Visual note */
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[MAX_NLEN];
 #ifndef JP
                                char m_poss[80];
 
                                /* Acquire the monster possessive */
                                monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
 #ifdef JP
                                msg_format("%^sは勇気を取り戻した。", m_name);
 #else
@@ -608,12 +584,8 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                {
                        if (is_seen(m_ptr))
                        {
-                               char m_name[80];
-
-                               /* Acquire the monster name */
+                               GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, 0);
-
-                               /* Dump a message */
                                msg_format(_("%^sはもう無敵でない。", "%^s is no longer invulnerable."), m_name);
                        }
                }
@@ -654,7 +626,7 @@ void process_monsters_mtimed(int mtimed_idx)
 void dispel_monster_status(MONSTER_IDX m_idx)
 {
        monster_type *m_ptr = &m_list[m_idx];
-       char         m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        monster_desc(m_name, m_ptr, 0);
        if (set_monster_invulner(m_idx, 0, TRUE))
@@ -686,7 +658,7 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 
        if (vs_player)
        {
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
                monster_desc(m_name, m_ptr, 0);
 
                if (who == 1)
@@ -707,31 +679,14 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
        {
                if (!m_ptr->r_idx) break;
                process_monster(world_monster);
-
                reset_target(m_ptr);
+               handle_stuff();
 
-               /* Notice stuff */
-               if (p_ptr->notice) notice_stuff();
-
-               if (p_ptr->update) update_stuff();
-
-               /* Redraw stuff */
-               if (p_ptr->redraw) redraw_stuff();
-
-               /* Redraw stuff */
-               if (p_ptr->window) window_stuff();
-
-               /* Delay */
                if (vs_player) Term_xtra(TERM_XTRA_DELAY, 500);
        }
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
-
-       /* Update monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Window stuff */
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 
        world_monster = 0;
@@ -742,7 +697,6 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
        }
 
        handle_stuff();
-
        return (TRUE);
 }
 
@@ -782,7 +736,7 @@ void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
 
        if (m_ptr->exp >= r_ptr->next_exp)
        {
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
                int old_hp = m_ptr->hp;
                int old_maxhp = m_ptr->max_maxhp;
                int old_r_idx = m_ptr->r_idx;
@@ -859,7 +813,7 @@ void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx)
                        /* Now you feel very close to this pet. */
                        m_ptr->parent_m_idx = 0;
                }
-               update_mon(m_idx, FALSE);
+               update_monster(m_idx, FALSE);
                lite_spot(m_ptr->fy, m_ptr->fx);
        }
        if (m_idx == p_ptr->riding) p_ptr->update |= PU_BONUS;