[Refactor] #define ALLOW_EASY_FLOOR による分岐処理削除 / Delete #define branch by ALLOW_EASY_F...

[hengband/hengband.git] / src / mspells4.c

diff --git a/src/mspells4.c b/src/mspells4.c
index 3fefa0b..a0a31c3 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -129,7 +129,7 @@ static void monspell_message_base(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg
        monster_name(t_idx, t_name);
 
        if (mon_to_player || (mon_to_mon && known && see_either))
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
 
        if (msg_flag_aux)
        {
@@ -459,7 +459,7 @@ HIT_POINT spell_RF4_BREATH(int GF_TYPE, POSITION y, POSITION x, MONSTER_IDX m_id
        }
 
        if (mon_to_player || (mon_to_mon && known && see_either))
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
 
        if (m_ptr->r_idx == MON_JAIAN && GF_TYPE == GF_SOUND)
        {
@@ -843,7 +843,7 @@ HIT_POINT spell_RF5_DRAIN_MANA(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
        }
        else if (TARGET_TYPE == MONSTER_TO_MONSTER && see_monster(m_idx))
        { 
@@ -880,7 +880,7 @@ HIT_POINT spell_RF5_MIND_BLAST(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTE
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                if (!seen)
                        msg_print(_("何かがあなたの精神に念を放っているようだ。", "You feel something focusing on your mind."));
                else
@@ -917,7 +917,7 @@ HIT_POINT spell_RF5_BRAIN_SMASH(POSITION y, POSITION x, MONSTER_IDX m_idx, MONST
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                if (!seen)
                        msg_print(_("何かがあなたの精神に念を放っているようだ。", "You feel something focusing on your mind."));
                else
@@ -956,7 +956,7 @@ void spell_RF5_CAUSE(int GF_TYPE, HIT_POINT dam, POSITION y, POSITION x, MONSTER
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                if (p_ptr->blind)
                        msg_format(msg1, m_name);
                else
@@ -1404,7 +1404,7 @@ void spell_badstatus_message(MONSTER_IDX m_idx, MONSTER_IDX t_idx, cptr msg1, cp
 
        if (TARGET_TYPE == MONSTER_TO_PLAYER)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                if (p_ptr->blind)
                        msg_format(msg1, m_name);
                else
@@ -1799,7 +1799,7 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE)
        char m_name[80];
        monster_name(m_idx, m_name);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
        monspell_message_base(m_idx, t_idx,
                _("%^sが何かをつぶやいた。", "%^s mumbles."),
@@ -1883,7 +1883,7 @@ void spell_RF6_BLINK(MONSTER_IDX m_idx, int TARGET_TYPE)
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
 
        if (teleport_barrier(m_idx))
        {
@@ -1914,7 +1914,7 @@ void spell_RF6_TPORT(MONSTER_IDX m_idx, int TARGET_TYPE)
        monster_name(m_idx, m_name);
        
        if (TARGET_TYPE==MONSTER_TO_PLAYER)
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
        if (teleport_barrier(m_idx))
        {
                if(see_monster(m_idx))
@@ -1941,7 +1941,7 @@ HIT_POINT spell_RF6_WORLD(MONSTER_IDX m_idx)
        char m_name[80];
        monster_name(m_idx, m_name);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
        if (m_ptr->r_idx == MON_DIO) who = 1;
        else if (m_ptr->r_idx == MON_WONG) who = 3;
        if (!process_the_world(randint1(2) + 2, who, TRUE)) return (FALSE);
@@ -2066,7 +2066,7 @@ HIT_POINT spell_RF6_SPECIAL_B(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER
        char m_name[80];
        monster_name(m_idx, m_name);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
        if (one_in_(3) || !direct)
        {               
                simple_monspell_message(m_idx, t_idx,
@@ -2156,7 +2156,7 @@ HIT_POINT spell_RF6_SPECIAL(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_I
        monster_type    *m_ptr = &m_list[m_idx];
        monster_race    *r_ptr = &r_info[m_ptr->r_idx];
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
        switch (m_ptr->r_idx)
        {
                case MON_OHMU:
@@ -2478,7 +2478,7 @@ void spell_RF6_TRAPS(POSITION y, POSITION x, MONSTER_IDX m_idx)
 {
        char m_name[80];
        monster_name(m_idx, m_name);
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
        if (p_ptr->blind)
                msg_format(_("%^sが何かをつぶやいて邪悪に微笑んだ。",
@@ -2501,7 +2501,7 @@ void spell_RF6_FORGET(MONSTER_IDX m_idx)
        char m_name[80];
        monster_name(m_idx, m_name);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
        msg_format(_("%^sがあなたの記憶を消去しようとしている。",
                "%^s tries to blank your mind."), m_name);
@@ -2700,7 +2700,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
        monster_name(t_idx, t_name);
        monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
        if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
        {
                monspell_message(m_idx, t_idx,
@@ -2712,7 +2712,7 @@ void spell_RF6_S_KIN(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_id
        else
        {
                if (mon_to_player || (mon_to_mon && known && see_either))
-                       disturb(1, 1);
+                       disturb(TRUE, TRUE);
 
                if (p_ptr->blind)
                {
@@ -3245,7 +3245,7 @@ void spell_RF6_S_HI_UNDEAD(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_ID
        char m_name[80];
        monster_name(m_idx, m_name);
 
-       disturb(1, 1);
+       disturb(TRUE, TRUE);
 
        if (((m_ptr->r_idx == MON_MORGOTH) || (m_ptr->r_idx == MON_SAURON) || (m_ptr->r_idx == MON_ANGMAR)) &&
                ((r_info[MON_NAZGUL].cur_num + 2) < r_info[MON_NAZGUL].max_num) &&