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

diff --git a/src/cmd1.c b/src/cmd1.c
index 65800e5..db72178 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -1288,8 +1288,6 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
                else if (MON_MONFEAR(riding_m_ptr))
                {
                        char steed_name[80];
-
-                       /* Acquire the monster name */
                        monster_desc(steed_name, riding_m_ptr, 0);
 
                        /* Dump a message */

diff --git a/src/dungeon.c b/src/dungeon.c
index 1790122..bcc0a28 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4787,8 +4787,6 @@ static void process_player(void)
 
                        /* Recover fully */
                        (void)set_monster_csleep(p_ptr->riding, 0);
-
-                       /* Acquire the monster name */
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%^sを起こした。", "You have waked %s up."), m_name);
                }
@@ -4800,8 +4798,6 @@ static void process_player(void)
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_STUNNED(m_ptr) - 1)))
                        {
                                char m_name[80];
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -4816,8 +4812,6 @@ static void process_player(void)
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_CONFUSED(m_ptr) - 1)))
                        {
                                char m_name[80];
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -4832,8 +4826,6 @@ static void process_player(void)
                                (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_MONFEAR(m_ptr) - 1)))
                        {
                                char m_name[80];
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */

diff --git a/src/floor-save.c b/src/floor-save.c
index 73ef1cb..8a8605f 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -465,8 +465,6 @@ static void preserve_pet(void)
                        if (is_seen(m_ptr))
                        {
                                char m_name[80];
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
                                msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
                        }

diff --git a/src/monster-process.c b/src/monster-process.c
index e5c823e..aff5af8 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -2143,8 +2143,6 @@ void process_monster(MONSTER_IDX m_idx)
                if (see_m)
                {
                        char m_name[80];
-
-                       /* Acquire the monster name */
                        monster_desc(m_name, m_ptr, 0);
                        msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
                }
@@ -2174,14 +2172,11 @@ void process_monster(MONSTER_IDX m_idx)
                {
                        bool sad = FALSE;
 
-                       if (is_pet(m_ptr) && !(m_ptr->ml))
-                               sad = TRUE;
+                       if (is_pet(m_ptr) && !(m_ptr->ml)) sad = TRUE;
 
                        if (see_m)
                        {
                                char m_name[80];
-
-                               /* Acquire the monster name */
                                monster_desc(m_name, m_ptr, 0);
 
                                msg_format(_("%sは消え去った！", "%^s disappears!"), m_name);
@@ -2192,7 +2187,6 @@ void process_monster(MONSTER_IDX m_idx)
 
 
                        delete_monster_idx(m_idx);
-
                        if (sad)
                        {
                                msg_print(_("少しの間悲しい気分になった。", "You feel sad for a moment."));
@@ -2280,8 +2274,6 @@ void process_monster(MONSTER_IDX m_idx)
                if (m_ptr->ml)
                {
                        char m_name[80];
-
-                       /* Acquire the monster name */
                        monster_desc(m_name, m_ptr, 0);
 
                        /* Dump a message */
@@ -3115,8 +3107,6 @@ void process_monster(MONSTER_IDX m_idx)
 
                                        /* Acquire the object name */
                                        object_desc(o_name, o_ptr, 0);
-
-                                       /* Acquire the monster name */
                                        monster_desc(m_name, m_ptr, MD_INDEF_HIDDEN);
 
                                        /* React to objects that hurt the monster */
@@ -3289,8 +3279,6 @@ void process_monster(MONSTER_IDX m_idx)
                if (see_m)
                {
                        char m_name[80];
-
-                       /* Acquire the monster name */
                        monster_desc(m_name, m_ptr, 0);
 
                        /* Dump a message */

diff --git a/src/monster-status.c b/src/monster-status.c
index 35da7f4..290ac70 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -481,8 +481,6 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                                        if (m_ptr->ml)
                                        {
                                                char m_name[80];
-
-                                               /* Acquire the monster name */
                                                monster_desc(m_name, m_ptr, 0);
 
                                                /* Dump a message */
@@ -507,8 +505,6 @@ 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 */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -524,8 +520,6 @@ 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 */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -545,8 +539,6 @@ 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 */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -564,8 +556,6 @@ 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 */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */
@@ -588,8 +578,6 @@ static void process_monsters_mtimed_aux(MONSTER_IDX m_idx, int mtimed_idx)
                                /* 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 */
@@ -609,8 +597,6 @@ 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 */
                                monster_desc(m_name, m_ptr, 0);
 
                                /* Dump a message */

diff --git a/src/spells2.c b/src/spells2.c
index be1e27a..309c546 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2246,8 +2246,6 @@ static void cave_temp_room_lite(void)
                                if (m_ptr->ml)
                                {
                                        char m_name[80];
-
-                                       /* Acquire the monster name */
                                        monster_desc(m_name, m_ptr, 0);
 
                                        /* Dump a message */

diff --git a/src/spells3.c b/src/spells3.c
index 96c5a75..675e217 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1392,7 +1392,6 @@ static bool vanish_dungeon(void)
                                /* Notice the "waking up" */
                                if (m_ptr->ml)
                                {
-                                       /* Acquire the monster name */
                                        monster_desc(m_name, m_ptr, 0);
 
                                        /* Dump a message */