幻覚状態の時に死因が ランダムな名前+(?) になってしまっていたのを、

ちゃんと正しい名前になるようにした。(?)の追加も廃止。

diff --git a/src/cmd1.c b/src/cmd1.c
index c19bf2d..3b77d2a 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2169,7 +2169,7 @@ void touch_zap_player(monster_type *m_ptr)
                        aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
                        /* Hack -- Get the "died from" name */
-                       monster_desc(aura_dam, m_ptr, 0x88);
+                       monster_desc(aura_dam, m_ptr, 0x288);
 
 #ifdef JP
                        msg_print("ÆÍÁ³¤È¤Æ¤âÇ®¤¯¤Ê¤Ã¤¿¡ª");
@@ -2196,7 +2196,7 @@ void touch_zap_player(monster_type *m_ptr)
                        aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
                        /* Hack -- Get the "died from" name */
-                       monster_desc(aura_dam, m_ptr, 0x88);
+                       monster_desc(aura_dam, m_ptr, 0x288);
 
 #ifdef JP
                        msg_print("ÆÍÁ³¤È¤Æ¤â´¨¤¯¤Ê¤Ã¤¿¡ª");
@@ -2223,7 +2223,7 @@ void touch_zap_player(monster_type *m_ptr)
                        aura_damage = damroll(1 + (r_ptr->level / 26), 1 + (r_ptr->level / 17));
 
                        /* Hack -- Get the "died from" name */
-                       monster_desc(aura_dam, m_ptr, 0x88);
+                       monster_desc(aura_dam, m_ptr, 0x288);
 
                        if (p_ptr->oppose_elec) aura_damage = (aura_damage + 2) / 3;
                        if (p_ptr->resist_elec) aura_damage = (aura_damage + 2) / 3;

diff --git a/src/effects.c b/src/effects.c
index cf3bb2e..cb09dec 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -4991,8 +4991,6 @@ bool take_hit(int damage_type, int damage, cptr hit_from, int monspell)
                        /* Note cause of death */
                        (void)strcpy(died_from, hit_from);
 
-                       if (p_ptr->image) strcat(died_from,"(?)");
-
                        /* No longer a winner */
                        total_winner = FALSE;
 

diff --git a/src/melee1.c b/src/melee1.c
index 8521934..e1562a6 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -190,7 +190,7 @@ bool make_attack_normal(int m_idx)
        monster_desc(m_name, m_ptr, 0);
 
        /* Get the "died from" information (i.e. "a kobold") */
-       monster_desc(ddesc, m_ptr, 0x88);
+       monster_desc(ddesc, m_ptr, 0x288);
 
        if (p_ptr->special_defense & KATA_IAI)
        {

diff --git a/src/melee2.c b/src/melee2.c
index 5f4d1cf..c02d019 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1465,7 +1465,7 @@ static bool monst_attack_monst(int m_idx, int t_idx)
        int             ap_cnt;
        int             ac, rlev, pt;
        char            m_name[80], t_name[80];
-       char            ddesc[80], temp[80];
+       char            temp[80];
        bool            blinked, heal_effect;
        bool            explode = FALSE, touched = FALSE, fear = FALSE;
        int             y_saver = t_ptr->fy;
@@ -1502,9 +1502,6 @@ static bool monst_attack_monst(int m_idx, int t_idx)
        /* Get the monster name (or "it") */
        monster_desc(t_name, t_ptr, 0);
 
-       /* Get the "died from" information (i.e. "a kobold") */
-       monster_desc(ddesc, m_ptr, 0x88);
-
        /* Assume no blink */
        blinked = FALSE;
 

diff --git a/src/monster2.c b/src/monster2.c
index 4a6c9cc..d9e7e3a 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1455,6 +1455,8 @@ s16b get_mon_num(int level)
  *   0x20 --> Pronominalize visible monsters
  *   0x40 --> Assume the monster is hidden
  *   0x80 --> Assume the monster is visible
+ *  0x100 --> Chameleon's true name
+ *  0x200 --> Ignore hallucination
  *
  * Useful Modes:
  *   0x00 --> Full nominative name ("the kobold") or "it"
@@ -1486,7 +1488,7 @@ void monster_desc(char *desc, monster_type *m_ptr, int mode)
        else name = (r_name + r_ptr->name);
 
        /* Are we hallucinating? (Idea from Nethack...) */
-       if (p_ptr->image)
+       if (p_ptr->image && !(mode & 0x200))
        {
                if (one_in_(2))
                {
@@ -1641,7 +1643,7 @@ if (!get_rnd_line("silly_j.txt", m_ptr->r_idx, silly_name))
        else
        {
                /* It could be a Unique */
-               if ((r_ptr->flags1 & RF1_UNIQUE) && !p_ptr->image)
+               if ((r_ptr->flags1 & RF1_UNIQUE) && !(p_ptr->image && !(mode & 0x200)))
                {
                        /* Start with the name (thus nominative and objective) */
                        if ((m_ptr->mflag2 & MFLAG_CHAMELEON) && !(mode & 0x100))

diff --git a/src/mspells1.c b/src/mspells1.c
index 42141fa..bf6e093 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1476,7 +1476,7 @@ bool make_attack_spell(int m_idx)
        monster_desc(m_poss, m_ptr, 0x22);
 
        /* Hack -- Get the "died from" name */
-       monster_desc(ddesc, m_ptr, 0x88);
+       monster_desc(ddesc, m_ptr, 0x288);
 
        if (stupid_monsters)
        {

diff --git a/src/spells1.c b/src/spells1.c
index c829723..f81e6f3 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -2842,7 +2842,7 @@ msg_print("
                                        else
                                        {
                                                /* Injure +/- confusion */
-                                               monster_desc(killer, m_ptr, 0x88);
+                                               monster_desc(killer, m_ptr, 0x288);
                                                take_hit(DAMAGE_ATTACK, dam, killer, -1);  /* has already been /3 */
                                                if (one_in_(4))
                                                {
@@ -2980,7 +2980,7 @@ msg_print("
                                        else
                                        {
                                                /* Injure + mana drain */
-                                               monster_desc(killer, m_ptr, 0x88);
+                                               monster_desc(killer, m_ptr, 0x288);
 #ifdef JP
 msg_print("ĶǽÎϥѥ¤òµÛ¤¤¤È¤é¤ì¤¿¡ª");
 #else
@@ -7924,7 +7924,7 @@ bool project(int who, int rad, int y, int x, int dam, int typ, int flg, int mons
        {
                x1 = m_list[who].fx;
                y1 = m_list[who].fy;
-               monster_desc(who_name, &m_list[who], 0x88);
+               monster_desc(who_name, &m_list[who], 0x288);
        }
 
        /* Oops */