From e09d1cca99f971e0ee07350e5f6ab237856d7441 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 3 Apr 2019 09:07:06 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20monster=5Fname()=20=E3=81=A7?=
 =?utf8?q?=E4=B8=80=E9=83=A8=20cmd2.c=20=E3=81=AE=E6=8A=95=E6=93=B2?=
 =?utf8?q?=E5=AF=BE=E8=B1=A1=E5=87=A6=E7=90=86=E3=82=92=E6=95=B4=E7=90=86?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd2.c     | 15 ++++-----------
 src/monster2.c |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/cmd2.c b/src/cmd2.c
index c5e3e64f3..6ff147fb3 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2592,6 +2592,8 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 		{
 			grid_type *g_ptr = &current_floor_ptr->grid_array[y][x];
 			monster_type *m_ptr = &current_floor_ptr->m_list[g_ptr->m_idx];
+			GAME_TEXT m_name[MAX_NLEN];
+			monster_name(g_ptr->m_idx, m_name);
 
 			/* Check the visibility */
 			visible = m_ptr->ml;
@@ -2614,8 +2616,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 				/* Handle visible monster */
 				else
 				{
-					GAME_TEXT m_name[MAX_NLEN];
-					monster_desc(m_name, m_ptr, 0);
 					msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name);
 
 					if (m_ptr->ml)
@@ -2684,8 +2684,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 					if (fear && m_ptr->ml)
 					{
 						sound(SOUND_FLEE);
-						GAME_TEXT m_name[MAX_NLEN];
-						monster_desc(m_name, m_ptr, 0);
 						msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name);
 					}
 				}
@@ -2714,7 +2712,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 
 	}
 
-
 	/* Potions smash open */
 	if (object_is_potion(q_ptr))
 	{
@@ -2725,14 +2722,10 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
 			if (potion_smash_effect(0, y, x, q_ptr->k_idx))
 			{
 				monster_type *m_ptr = &current_floor_ptr->m_list[current_floor_ptr->grid_array[y][x].m_idx];
-
-				/* ToDo (Robert): fix the invulnerability */
-				if (current_floor_ptr->grid_array[y][x].m_idx &&
-				    is_friendly(&current_floor_ptr->m_list[current_floor_ptr->grid_array[y][x].m_idx]) &&
-				    !MON_INVULNER(m_ptr))
+				if (current_floor_ptr->grid_array[y][x].m_idx && is_friendly(m_ptr) && !MON_INVULNER(m_ptr))
 				{
 					GAME_TEXT m_name[MAX_NLEN];
-					monster_desc(m_name, &current_floor_ptr->m_list[current_floor_ptr->grid_array[y][x].m_idx], 0);
+					monster_desc(m_name, m_ptr, 0);
 					msg_format(_("%sは怒った！", "%^s gets angry!"), m_name);
 					set_hostile(&current_floor_ptr->m_list[current_floor_ptr->grid_array[y][x].m_idx]);
 				}
diff --git a/src/monster2.c b/src/monster2.c
index 29ac83f69..33ff4ae0b 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1586,7 +1586,7 @@ void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode)
 */
 void monster_name(MONSTER_IDX m_idx, char* m_name)
 {
-	monster_type	*m_ptr = &current_floor_ptr->m_list[m_idx];
+	monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
 	monster_desc(m_name, m_ptr, 0x00);
 }
 
-- 
2.11.0