[Refactor] #37353 MD_WRONGDOER_NAME を定義.

diff --git a/src/defines.h b/src/defines.h
index aa6e240..5a70a79 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1947,6 +1947,7 @@
 #define MD_TRUE_NAME      0x00000100 /* Chameleon's true name */
 #define MD_IGNORE_HALLU   0x00000200 /* Ignore hallucination, and penetrate shape change */
 
+#define MD_WRONGDOER_NAME (MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE) /* 加害明記向け */
 
 /*
  * Bit flags for object_desc()

diff --git a/src/melee1.c b/src/melee1.c
index 2aaa9c6..e48f72b 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -636,11 +636,8 @@ static void touch_zap_player_aux(monster_type *m_ptr, bool immune, int flags_off
                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 */
-               monster_desc(mon_name, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
-
+               monster_desc(mon_name, m_ptr, MD_WRONGDOER_NAME);
                msg_print(message);
-
                dam_func(aura_damage, mon_name, -1, TRUE);
 
                if (is_original_ap_and_seen(m_ptr))
@@ -1925,12 +1922,10 @@ bool make_attack_normal(MONSTER_IDX m_idx)
        /* Extract the effective monster level */
        rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
 
-
        /* Get the monster name (or "it") */
        monster_desc(m_name, m_ptr, 0);
 
-       /* Get the "died from" information (i.e. "a kobold") */
-       monster_desc(ddesc, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+       monster_desc(ddesc, m_ptr, MD_WRONGDOER_NAME);
 
        if (p_ptr->special_defense & KATA_IAI)
        {

diff --git a/src/monster1.c b/src/monster1.c
index f322f2f..09492ef 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2622,8 +2622,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                {
                        GAME_TEXT m_name[MAX_NLEN];
 
-                       /* Extract monster name */
-                       monster_desc(m_name, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+                       monster_desc(m_name, m_ptr, MD_WRONGDOER_NAME);
 
                        do_cmd_write_nikki(NIKKI_ARENA, p_ptr->arena_number, m_name);
                }

diff --git a/src/spells1.c b/src/spells1.c
index fc62542..99816f5 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1593,7 +1593,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                else
                                                {
                                                        /* Injure +/- confusion */
-                                                       monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+                                                       monster_desc(killer, m_ptr, MD_WRONGDOER_NAME);
                                                        take_hit(DAMAGE_ATTACK, dam, killer, -1);  /* has already been /3 */
                                                        if (one_in_(4) && !CHECK_MULTISHADOW())
                                                        {
@@ -1683,7 +1683,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                else
                                                {
                                                        /* Injure + mana drain */
-                                                       monster_desc(killer, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+                                                       monster_desc(killer, m_ptr, MD_WRONGDOER_NAME);
                                                        if (!CHECK_MULTISHADOW())
                                                        {
                                                                msg_print(_("超能力パワーを吸いとられた！", "Your psychic energy is drained!"));
@@ -5499,7 +5499,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        {
                x1 = current_floor_ptr->m_list[who].fx;
                y1 = current_floor_ptr->m_list[who].fy;
-               monster_desc(who_name, &current_floor_ptr->m_list[who], MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
+               monster_desc(who_name, &current_floor_ptr->m_list[who], MD_WRONGDOER_NAME);
        }
 
        else

diff --git a/src/spells2.c b/src/spells2.c
index b05718f..952dc5a 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1811,10 +1811,7 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
                        {
                                GAME_TEXT m_name[MAX_NLEN];
                                monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
-
-                               /* Get the monster's real name */
-                               monster_desc(m_name, m_ptr, MD_IGNORE_HALLU | MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
-
+                               monster_desc(m_name, m_ptr, MD_WRONGDOER_NAME);
                                killer = format(_("%sの起こした地震", "an earthquake caused by %s"), m_name);
                        }
                        else