Set disturbing flag for travel command.

diff --git a/src/cave.c b/src/cave.c
index ed4496a..36eef79 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -5047,7 +5047,7 @@ void disturb(int stop_search, int stop_travel)
        }
 
 #ifdef TRAVEL
-       if (stop_travel < 1)
+       if (stop_travel)
        {
                /* Cancel */
                travel.run = 0;

diff --git a/src/cmd1.c b/src/cmd1.c
index 85a37b5..e33f81c 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -712,7 +712,7 @@ void search(void)
 #endif
 
                                        /* Disturb */
-                                       disturb(0, 0);
+                                       disturb(0, 1);
                                }
 
                                /* Secret door */
@@ -954,7 +954,7 @@ void carry(bool pickup)
                next_o_idx = o_ptr->next_o_idx;
 
                /* Hack -- disturb */
-               disturb(0, 0);
+               disturb(0, 1);
 
                /* Pick up gold */
                if (o_ptr->tval == TV_GOLD)
@@ -1100,7 +1100,7 @@ static void hit_trap(bool break_trap)
 #endif
 
        /* Disturb the player */
-       disturb(0, 0);
+       disturb(0, 1);
 
        cave_alter_feat(y, x, FF_HIT_TRAP);
 
@@ -3089,7 +3089,7 @@ bool py_attack(int y, int x, int mode)
        char            m_name[80];
 
        /* Disturb the player */
-       disturb(0, 0);
+       disturb(0, 1);
 
        energy_use = 100;
 
@@ -3611,7 +3611,7 @@ bool move_player_effect(int ny, int nx, u32b mpe_mode)
        if (have_flag(f_ptr->flags, FF_STORE))
        {
                /* Disturb */
-               disturb(0, 0);
+               disturb(0, 1);
 
                energy_use = 0;
                /* Hack -- Enter store */
@@ -3622,7 +3622,7 @@ bool move_player_effect(int ny, int nx, u32b mpe_mode)
        else if (have_flag(f_ptr->flags, FF_BLDG))
        {
                /* Disturb */
-               disturb(0, 0);
+               disturb(0, 1);
 
                energy_use = 0;
                /* Hack -- Enter building */
@@ -3633,7 +3633,7 @@ bool move_player_effect(int ny, int nx, u32b mpe_mode)
        else if (have_flag(f_ptr->flags, FF_QUEST_ENTER))
        {
                /* Disturb */
-               disturb(0, 0);
+               disturb(0, 1);
 
                energy_use = 0;
                /* Hack -- Enter quest level */
@@ -3670,7 +3670,7 @@ bool move_player_effect(int ny, int nx, u32b mpe_mode)
        else if (have_flag(f_ptr->flags, FF_HIT_TRAP) && !(mpe_mode & MPE_STAYING))
        {
                /* Disturb */
-               disturb(0, 0);
+               disturb(0, 1);
 
                /* Hidden trap */
                if (c_ptr->mimic || have_flag(f_ptr->flags, FF_SECRET))
@@ -3711,7 +3711,7 @@ bool move_player_effect(int ny, int nx, u32b mpe_mode)
 #endif
                        }
 
-                       if (disturb_trap_detect) disturb(0, 0);
+                       if (disturb_trap_detect) disturb(0, 1);
                }
        }
 
@@ -3972,7 +3972,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
 #endif
                        energy_use = 0;
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
                else if (MON_MONFEAR(riding_m_ptr))
                {
@@ -3988,12 +3988,12 @@ void move_player(int dir, bool do_pickup, bool break_trap)
                        msg_format("%^s is too scared to control.", m_name);
 #endif
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
                else if (p_ptr->riding_ryoute)
                {
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
                else if (have_flag(f_ptr->flags, FF_CAN_FLY) && (riding_r_ptr->flags7 & RF7_CAN_FLY))
                {
@@ -4014,7 +4014,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
 #endif
                        energy_use = 0;
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
                else if (!have_flag(f_ptr->flags, FF_WATER) && (riding_r_ptr->flags7 & RF7_AQUATIC))
                {
@@ -4025,7 +4025,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
 #endif
                        energy_use = 0;
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
                else if (have_flag(f_ptr->flags, FF_LAVA) && !(riding_r_ptr->flagsr & RFR_EFF_IM_FIRE_MASK))
                {
@@ -4036,7 +4036,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
 #endif
                        energy_use = 0;
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
 
                if (oktomove && MON_STUNNED(riding_m_ptr) && one_in_(2))
@@ -4049,7 +4049,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
                        msg_format("You cannot control stunned %s!",m_name);
 #endif
                        oktomove = FALSE;
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
@@ -4104,9 +4104,6 @@ void move_player(int dir, bool do_pickup, bool break_trap)
 
                oktomove = FALSE;
 
-               /* Disturb the player */
-               disturb(0, 0);
-
                /* Notice things in the dark */
                if (!(c_ptr->info & CAVE_MARK) && !player_can_see_bold(y, x))
                {
@@ -4176,6 +4173,9 @@ void move_player(int dir, bool do_pickup, bool break_trap)
                        }
                }
 
+               /* Disturb the player */
+               disturb(0, 1);
+
                /* Sound */
                if (!boundary_floor(c_ptr, f_ptr, mimic_f_ptr)) sound(SOUND_HITWALL);
        }
@@ -4189,7 +4189,7 @@ void move_player(int dir, bool do_pickup, bool break_trap)
                }
 
                /* To avoid a loop with running */
-               disturb(0, 0);
+               disturb(0, 1);
 
                oktomove = FALSE;
        }
@@ -5110,7 +5110,6 @@ void travel_step(void)
 {
        int i;
        int dir = travel.dir;
-       int old_run = travel.run;
 
        find_prevdir = dir;
 
@@ -5125,7 +5124,7 @@ void travel_step(void)
                        msg_print("No route is found!");
 #endif
                }
-               disturb(0, 0);
+               disturb(0, 1);
                return;
        }
 
@@ -5144,13 +5143,12 @@ void travel_step(void)
        /* Close door */
        if (!easy_open && is_closed_door(cave[py+ddy[dir]][px+ddx[dir]].feat))
        {
-               disturb(0, 0);
+               disturb(0, 1);
                return;
        }
 
        travel.dir = dir;
        move_player(dir, always_pickup, easy_disarm);
-       /* travel.run = old_run; */
 
        if ((py == travel.y) && (px == travel.x))
                travel.run = 0;

diff --git a/src/dungeon.c b/src/dungeon.c
index 9485be2..8edaca2 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1129,7 +1129,7 @@ static void notice_lite_change(object_type *o_ptr)
        /* The light is now out */
        else if (o_ptr->xtra4 == 0)
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬¾Ã¤¨¤Æ¤·¤Þ¤Ã¤¿¡ª");
 #else
@@ -1149,7 +1149,7 @@ msg_print("
                if ((o_ptr->xtra4 < 50) && (!(o_ptr->xtra4 % 5))
                    && (turn % (TURNS_PER_TICK*2)))
                {
-                       if (disturb_minor) disturb(0, 0);
+                       if (disturb_minor) disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬Èù¤«¤Ë¤Ê¤Ã¤Æ¤­¤Æ¤¤¤ë¡£");
 #else
@@ -1162,7 +1162,7 @@ msg_print("
        /* The light is getting dim */
        else if ((o_ptr->xtra4 < 100) && (!(o_ptr->xtra4 % 10)))
        {
-               if (disturb_minor) disturb(0, 0);
+               if (disturb_minor) disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬Èù¤«¤Ë¤Ê¤Ã¤Æ¤­¤Æ¤¤¤ë¡£");
 #else
@@ -2280,7 +2280,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_BERS_RAGE) && one_in_(3000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("¥¦¥¬¥¡¥¡¥¢¡ª");
                msg_print("·ãÅܤÎȯºî¤Ë½±¤ï¤ì¤¿¡ª");
@@ -2297,7 +2297,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_fear)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 #ifdef JP
                        msg_print("¤È¤Æ¤â°Å¤¤... ¤È¤Æ¤â¶²¤¤¡ª");
 #else
@@ -2313,7 +2313,7 @@ static void process_world_aux_mutation(void)
                if (!p_ptr->resist_nexus && !(p_ptr->muta1 & MUT1_VTELEPORT) &&
                    !p_ptr->anti_tele)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Teleport player */
 #ifdef JP
@@ -2331,7 +2331,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_conf && !p_ptr->resist_chaos)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
                        p_ptr->redraw |= PR_EXTRA;
 #ifdef JP
                        msg_print("¤¤¤Ò¤­¤¬¤â¡¼¤í¡¼¤È¤Ò¤Æ¤­¤¿¤­¤¬¤Õ¤ë...¥Ò¥Ã¥¯¡ª");
@@ -2384,7 +2384,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_chaos)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
                        p_ptr->redraw |= PR_EXTRA;
                        (void)set_image(p_ptr->image + randint0(50) + 20);
                }
@@ -2392,7 +2392,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_FLATULENT) && (randint1(3000) == 13))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 
 #ifdef JP
                msg_print("¥Ö¥¥¡¼¡¼¥Ã¡ª¤ª¤Ã¤È¡£");
@@ -2408,7 +2408,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && one_in_(9000))
        {
                int dire = 0;
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("ËâË¡¤Î¥¨¥Í¥ë¥®¡¼¤¬ÆÍÁ³¤¢¤Ê¤¿¤ÎÃæ¤Ëή¤ì¹þ¤ó¤Ç¤­¤¿¡ª¥¨¥Í¥ë¥®¡¼¤ò²òÊü¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡ª");
 #else
@@ -2439,13 +2439,13 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted a demon!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_SPEED_FLUX) && one_in_(6000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
                if (one_in_(2))
                {
 #ifdef JP
@@ -2484,7 +2484,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_BANISH_ALL) && one_in_(9000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("ÆÍÁ³¤Û¤È¤ó¤É¸ÉÆȤˤʤ俵¤¤¬¤¹¤ë¡£");
 #else
@@ -2582,14 +2582,14 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted an animal!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_RAW_CHAOS) &&
            !p_ptr->anti_magic && one_in_(8000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("¼þ¤ê¤Î¶õ´Ö¤¬ÏĤó¤Ç¤¤¤ëµ¤¤¬¤¹¤ë¡ª");
 #else
@@ -2611,7 +2611,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_WRAITH) && !p_ptr->anti_magic && one_in_(3000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("Èóʪ¼Á²½¤·¤¿¡ª");
 #else
@@ -2662,7 +2662,7 @@ static void process_world_aux_mutation(void)
 
                if (!sustained)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 #ifdef JP
                        msg_print("¼«Ê¬¤¬¿ê¼å¤·¤Æ¤¤¤¯¤Î¤¬Ê¬¤«¤ë¡ª");
 #else
@@ -2690,7 +2690,7 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted a dragon!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
        if ((p_ptr->muta2 & MUT2_WEIRD_MIND) && !p_ptr->anti_magic &&
@@ -2720,7 +2720,7 @@ static void process_world_aux_mutation(void)
        if ((p_ptr->muta2 & MUT2_NAUSEA) && !p_ptr->slow_digest &&
            one_in_(9000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("°ß¤¬áÛÚ»¤·¡¢¿©»ö¤ò¼º¤Ã¤¿¡ª");
 #else
@@ -2804,7 +2804,7 @@ static void process_world_aux_mutation(void)
        if ((p_ptr->muta2 & MUT2_INVULN) && !p_ptr->anti_magic &&
            one_in_(5000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("̵Ũ¤Êµ¤¤¬¤¹¤ë¡ª");
 #else
@@ -2865,7 +2865,7 @@ static void process_world_aux_mutation(void)
                int slot = 0;
                object_type *o_ptr = NULL;
 
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("­¤¬¤â¤Ä¤ì¤Æž¤ó¤À¡ª");
                take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), "žÅÝ", -1);
@@ -2959,7 +2959,7 @@ static void process_world_aux_curse(void)
                        if (get_check_strict("Teleport? ", CHECK_OKAY_CANCEL))
 #endif
                        {
-                               disturb(0, 0);
+                               disturb(0, 1);
                                teleport_player(50, 0L);
                        }
                        else
@@ -2969,7 +2969,7 @@ static void process_world_aux_curse(void)
 #else
                                msg_format("You can inscribe {.} on your %s to disable random teleportation. ", o_name);
 #endif
-                               disturb(1, 0);
+                               disturb(1, 1);
                        }
                }
                /* Make a chainsword noise */
@@ -3069,7 +3069,7 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted an animal!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                /* Call demon */
@@ -3086,7 +3086,7 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted a demon!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                /* Call dragon */
@@ -3104,14 +3104,14 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted an animal!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                if ((p_ptr->cursed & TRC_COWARDICE) && one_in_(1500))
                {
                        if (!p_ptr->resist_fear)
                        {
-                               disturb(0, 0);
+                               disturb(0, 1);
 #ifdef JP
                                msg_print("¤È¤Æ¤â°Å¤¤... ¤È¤Æ¤â¶²¤¤¡ª");
 #else
@@ -3124,7 +3124,7 @@ static void process_world_aux_curse(void)
                /* Teleport player */
                if ((p_ptr->cursed & TRC_TELEPORT) && one_in_(200) && !p_ptr->anti_tele)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Teleport player */
                        teleport_player(40, TELEPORT_PASSIVE);
@@ -3324,7 +3324,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->word_recall)
                {
                        /* Disturbing! */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Determine the level */
                        if (dun_level || p_ptr->inside_quest || p_ptr->enter_dungeon)
@@ -3438,7 +3438,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->alter_reality)
                {
                        /* Disturbing! */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Determine the level */
                        if (!quest_number(dun_level) && dun_level)
@@ -3824,7 +3824,7 @@ static void process_world(void)
                        if (closing_flag <= 2)
                        {
                                /* Disturb */
-                               disturb(0, 0);
+                               disturb(0, 1);
 
                                /* Count warnings */
                                closing_flag++;
@@ -4088,7 +4088,7 @@ msg_print("
                if ((hour == 23) && !(min % 15))
                {
                        /* Disturbing */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        switch (min / 15)
                        {
@@ -4131,7 +4131,7 @@ msg_print("
                {
                        int count = 0;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        msg_print("±ó¤¯¤Ç¾â¤¬²¿²ó¤âÌĤꡢ»à¤ó¤À¤è¤¦¤ÊÀŤ±¤µ¤ÎÃæ¤Ø¾Ã¤¨¤Æ¤¤¤Ã¤¿¡£");
 #else
@@ -4195,7 +4195,7 @@ msg_print("
                                msg_print("You faint from the lack of food.");
 #endif
 
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                /* Hack -- faint (bypass free action) */
                                (void)set_paralyzed(p_ptr->paralyzed + 1 + randint0(5));
@@ -5448,7 +5448,7 @@ static void pack_overflow(void)
                o_ptr = &inventory[INVEN_PACK];
 
                /* Disturbing */
-               disturb(0, 0);
+               disturb(0, 1);
 
                /* Warning */
 #ifdef JP
@@ -5634,7 +5634,7 @@ msg_print("
                                msg_print("Damn!  The fish stole your bait!");
 #endif
                        }
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
@@ -5642,7 +5642,7 @@ msg_print("
        if (check_abort)
        {
                /* Check for "player abort" (semi-efficiently for resting) */
-               if (running || command_rep || (p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH))
+               if (running || travel.run || command_rep || (p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH))
                {
                        /* Do not wait */
                        inkey_scan = TRUE;
@@ -5654,7 +5654,7 @@ msg_print("
                                flush();
 
                                /* Disturb */
-                               disturb(0, 0);
+                               disturb(0, 1);
 
                                /* Hack -- Show a Message */
 #ifdef JP
@@ -6173,7 +6173,7 @@ static void dungeon(bool load_game)
 
 
        /* Disturb */
-       disturb(1, 0);
+       disturb(1, 1);
 
        /* Get index of current quest (if any) */
        quest_num = quest_number(dun_level);

diff --git a/src/effects.c b/src/effects.c
index 66684a7..dc936ae 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -387,8 +387,7 @@ bool set_mimic(int v, int p, bool do_dec)
                return (FALSE);
 
        /* Disturb */
-       if (disturb_state)
-               disturb(0, 0);
+       if (disturb_state) disturb(0, 1);
 
        /* Redraw title */
        p_ptr->redraw |= (PR_BASIC | PR_STATUS);
@@ -884,7 +883,7 @@ msg_print("
        if (!notice) return (FALSE);
 
        /* Disturb */
-       if (disturb_state) disturb(0, 0);
+       if (disturb_state) disturb(0, 1);
 
        /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
@@ -5118,7 +5117,7 @@ int take_hit(int damage_type, int damage, cptr hit_from, int monspell)
        if (damage_type != DAMAGE_USELIFE)
        {
                /* Disturb */
-               disturb(1, 0);
+               disturb(1, 1);
                if (auto_more)
                {
                        now_damaged = TRUE;

diff --git a/src/files.c b/src/files.c
index 9b926b0..478cdc1 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6370,7 +6370,7 @@ msg_print("
        else
        {
                /* Disturb the player */
-               disturb(1, 0);
+               disturb(1, 1);
        }
 
        /* Clear messages */
@@ -7311,7 +7311,7 @@ void exit_game_panic(void)
        prt("", 0, 0);
 
        /* Hack -- turn off some things */
-       disturb(1, 0);
+       disturb(1, 1);
 
        /* Mega-Hack -- Delay death */
        if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;

diff --git a/src/melee1.c b/src/melee1.c
index 061c5ec..a40f24b 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -253,7 +253,7 @@ bool make_attack_normal(int m_idx)
                if (!effect || check_hit(power, rlev, MON_STUNNED(m_ptr)))
                {
                        /* Always disturbing */
-                       disturb(1, 0);
+                       disturb(1, 1);
 
 
                        /* Hack -- Apply "protection from evil" */
@@ -2191,7 +2191,7 @@ msg_format("%s
                                if (m_ptr->ml)
                                {
                                        /* Disturbing */
-                                       disturb(1, 0);
+                                       disturb(1, 1);
 
                                        /* Message */
 #ifdef JP

diff --git a/src/melee2.c b/src/melee2.c
index 5928770..b5855f5 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -212,7 +212,7 @@ void mon_take_hit_mon(int m_idx, int dam, bool *fear, cptr note, int who)
        /* Wake it up */
        (void)set_monster_csleep(m_idx, 0);
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 1);
 
        if (MON_INVULNER(m_ptr) && randint0(PENETRATE_INVULNERABILITY))
        {
@@ -1477,7 +1477,7 @@ static bool monst_attack_monst(int m_idx, int t_idx)
                mon_fight = TRUE;
        }
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Scan through all four blows */
        for (ap_cnt = 0; ap_cnt < 4; ap_cnt++)
@@ -1706,7 +1706,7 @@ act = "%s
 
                        case RBM_EXPLODE:
                                {
-                                       if (see_either) disturb(1, 0);
+                                       if (see_either) disturb(1, 1);
 #ifdef JP
 act = "Çúȯ¤·¤¿¡£";
 #else
@@ -2402,7 +2402,7 @@ static void process_monster(int m_idx)
                                msg_format("%^s seems to be in so much pain, and trying to escape from your restriction.", m_name);
 #endif
                                riding_pinch++;
-                               disturb(1, 0);
+                               disturb(1, 1);
                        }
                        else
                        {
@@ -3355,7 +3355,7 @@ msg_format("%^s%s", m_name, monmessage);
                        {
                                /* Disturb */
                                if (is_hostile(m_ptr))
-                                       disturb(0, 0);
+                                       disturb(0, 1);
                        }
 
                        /* Take or Kill objects on the floor */

diff --git a/src/monster2.c b/src/monster2.c
index 999eed4..fb10aa9 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -2600,7 +2600,7 @@ void update_mon(int m_idx, bool full)
                        if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, py, px) && projectable(py, px, m_ptr->fy, m_ptr->fx)))
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                        }
                }
        }
@@ -2625,7 +2625,7 @@ void update_mon(int m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                        }
                }
        }
@@ -2644,7 +2644,7 @@ void update_mon(int m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                        }
                }
        }
@@ -2662,7 +2662,7 @@ void update_mon(int m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                        }
                }
        }

diff --git a/src/mspells1.c b/src/mspells1.c
index eb11fe3..1b2ab43 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1669,7 +1669,7 @@ bool make_attack_spell(int m_idx)
        if (!spell_is_inate(thrown_spell)
            && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2)) || (randint0(100) < failrate)))
        {
-               disturb(1, 0);
+               disturb(1, 1);
                /* Message */
 #ifdef JP
                msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
@@ -1702,7 +1702,7 @@ bool make_attack_spell(int m_idx)
                /* RF4_SHRIEK */
                case 96+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤«¤ó¹â¤¤¶âÀÚ¤êÀ¼¤ò¤¢¤²¤¿¡£", m_name);
 #else
@@ -1724,7 +1724,7 @@ msg_format("%^s
                case 96+2:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
                        else msg_format("%^s¤¬ËâÎϾõî¤Î¼öʸ¤òÇ°¤¸¤¿¡£", m_name);
@@ -1746,7 +1746,7 @@ msg_format("%^s
                /* RF4_ROCKET */
                case 96+3:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¼Í¤Ã¤¿¡£", m_name);
 #else
@@ -1770,7 +1770,7 @@ else msg_format("%^s
                case 96+4:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬´ñ̯¤Ê²»¤òȯ¤·¤¿¡£", m_name);
 #else
@@ -1813,7 +1813,7 @@ else msg_format("%^s
                /* RF4_BR_ACID */
                case 96+8:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1835,7 +1835,7 @@ else msg_format("%^s
                /* RF4_BR_ELEC */
                case 96+9:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1857,7 +1857,7 @@ else msg_format("%^s
                /* RF4_BR_FIRE */
                case 96+10:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1879,7 +1879,7 @@ else msg_format("%^s
                /* RF4_BR_COLD */
                case 96+11:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1901,7 +1901,7 @@ else msg_format("%^s
                /* RF4_BR_POIS */
                case 96+12:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1924,7 +1924,7 @@ else msg_format("%^s
                /* RF4_BR_NETH */
                case 96+13:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1946,7 +1946,7 @@ else msg_format("%^s
                /* RF4_BR_LITE */
                case 96+14:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1968,7 +1968,7 @@ else msg_format("%^s
                /* RF4_BR_DARK */
                case 96+15:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -1990,7 +1990,7 @@ else msg_format("%^s
                /* RF4_BR_CONF */
                case 96+16:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2012,7 +2012,7 @@ else msg_format("%^s
                /* RF4_BR_SOUN */
                case 96+17:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_JAIAN)
 #ifdef JP
                                msg_format("¡Ö¥Ü¥©¥¨¡Á¡Á¡Á¡Á¡Á¡Á¡×");
@@ -2040,7 +2040,7 @@ else msg_format("%^s
                /* RF4_BR_CHAO */
                case 96+18:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2062,7 +2062,7 @@ else msg_format("%^s
                /* RF4_BR_DISE */
                case 96+19:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2084,7 +2084,7 @@ else msg_format("%^s
                /* RF4_BR_NEXU */
                case 96+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2106,7 +2106,7 @@ else msg_format("%^s
                /* RF4_BR_TIME */
                case 96+21:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2127,7 +2127,7 @@ else msg_format("%^s
                /* RF4_BR_INER */
                case 96+22:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2148,7 +2148,7 @@ else msg_format("%^s
                /* RF4_BR_GRAV */
                case 96+23:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2169,7 +2169,7 @@ else msg_format("%^s
                /* RF4_BR_SHAR */
                case 96+24:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_BOTEI)
 #ifdef JP
                                msg_format("¡Ö¥ÜÄë¥Ó¥ë¥«¥Ã¥¿¡¼¡ª¡ª¡ª¡×");
@@ -2197,7 +2197,7 @@ else msg_format("%^s
                /* RF4_BR_PLAS */
                case 96+25:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2218,7 +2218,7 @@ else msg_format("%^s
                /* RF4_BR_WALL */
                case 96+26:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2239,7 +2239,7 @@ else msg_format("%^s
                /* RF4_BR_MANA */
                case 96+27:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2259,7 +2259,7 @@ else msg_format("%^s
                /* RF4_BA_NUKE */
                case 96+28:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2281,7 +2281,7 @@ else msg_format("%^s
                /* RF4_BR_NUKE */
                case 96+29:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2303,7 +2303,7 @@ else msg_format("%^s
                /* RF4_BA_CHAO */
                case 96+30:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬¶²¤í¤·¤²¤Ë¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2325,7 +2325,7 @@ else msg_format("%^s
                /* RF4_BR_DISI */
                case 96+31:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤Î¥Ö¥ì¥¹¤òÅǤ¤¤¿¡£", m_name);
 #else
@@ -2348,7 +2348,7 @@ else msg_format("%^s
                /* RF5_BA_ACID */
                case 128+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
                        else msg_format("%^s¤¬¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
@@ -2375,7 +2375,7 @@ else msg_format("%^s
                case 128+1:
                {
                        int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
                        else msg_format("%^s¤¬¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
@@ -2402,7 +2402,7 @@ else msg_format("%^s
                case 128+2:
                {
                        int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        if (m_ptr->r_idx == MON_ROLENTO)
                        {
@@ -2448,7 +2448,7 @@ else msg_format("%^s
                case 128+3:
                {
                        int rad = (r_ptr->flags2 & RF2_POWERFUL) ? 4 : 2;
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
                        else msg_format("%^s¤¬¥¢¥¤¥¹¡¦¥Ü¡¼¥ë¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
@@ -2474,7 +2474,7 @@ else msg_format("%^s
                /* RF5_BA_POIS */
                case 128+4:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2496,7 +2496,7 @@ else msg_format("%^s
                /* RF5_BA_NETH */
                case 128+5:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2518,7 +2518,7 @@ else msg_format("%^s
                /* RF5_BA_WATE */
                case 128+6:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2545,7 +2545,7 @@ msg_print("
                /* RF5_BA_MANA */
                case 128+7:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2566,7 +2566,7 @@ else msg_format("%^s
                /* RF5_BA_DARK */
                case 128+8:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2589,7 +2589,7 @@ else msg_format("%^s
                case 128+9:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        dam = (randint1(rlev) / 2) + 1;
                        breath(y, x, m_idx, GF_DRAIN_MANA, dam, 0, FALSE, MS_DRAIN_MANA, learnable);
@@ -2601,7 +2601,7 @@ else msg_format("%^s
                case 128+10:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (!seen)
                        {
 #ifdef JP
@@ -2630,7 +2630,7 @@ msg_format("%^s
                case 128+11:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (!seen)
                        {
 #ifdef JP
@@ -2659,7 +2659,7 @@ msg_format("%^s
                case 128+12:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2681,7 +2681,7 @@ else msg_format("%^s
                case 128+13:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2703,7 +2703,7 @@ else msg_format("%^s
                case 128+14:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÂçÀ¼¤Ç¶«¤ó¤À¡£", m_name);
 #else
@@ -2725,7 +2725,7 @@ else msg_format("%^s
                case 128+15:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬¡Ö¤ªÁ°¤Ï´û¤Ë»à¤ó¤Ç¤¤¤ë¡×¤È¶«¤ó¤À¡£", m_name);
 #else
@@ -2747,7 +2747,7 @@ else msg_format("%^s
                case 128+16:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2771,7 +2771,7 @@ else msg_format("%^s
                case 128+17:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2795,7 +2795,7 @@ else msg_format("%^s
                case 128+18:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2819,7 +2819,7 @@ else msg_format("%^s
                case 128+19:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2842,7 +2842,7 @@ else msg_format("%^s
                /* RF5_BA_LITE */
                case 128+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤òÎ϶¯¤¯¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2865,7 +2865,7 @@ else msg_format("%^s
                case 128+21:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2889,7 +2889,7 @@ else msg_format("%^s
                case 128+22:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2912,7 +2912,7 @@ else msg_format("%^s
                case 128+23:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2935,7 +2935,7 @@ else msg_format("%^s
                case 128+24:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2958,7 +2958,7 @@ else msg_format("%^s
                case 128+25:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -2982,7 +2982,7 @@ else msg_format("%^s
                case 128+26:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3005,7 +3005,7 @@ else msg_format("%^s
                case 128+27:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢¶²¤í¤·¤²¤Ê²»¤¬Ê¹¤³¤¨¤¿¡£", m_name);
 #else
@@ -3049,7 +3049,7 @@ msg_print("
                case 128+28:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3093,7 +3093,7 @@ msg_print("
                case 128+29:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¯¤È¡¢Æ¬¤òǺ¤Þ¤¹²»¤¬¤·¤¿¡£", m_name);
 #else
@@ -3137,7 +3137,7 @@ msg_print("
                case 128+30:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤Î¶ÚÎϤòµÛ¤¤¼è¤í¤¦¤È¤·¤¿¡ª", m_name);
 #else
@@ -3175,7 +3175,7 @@ msg_print("
                case 128+31:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3218,7 +3218,7 @@ msg_format("
                /* RF6_HASTE */
                case 160+0:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (blind)
                        {
 #ifdef JP
@@ -3254,7 +3254,7 @@ msg_format("%^s
                case 160+1:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬<ÇËÌǤμê>¤òÊü¤Ã¤¿¡ª", m_name);
 #else
@@ -3268,7 +3268,7 @@ msg_format("%^s
                /* RF6_HEAL */
                case 160+2:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        /* Message */
                        if (blind)
@@ -3367,7 +3367,7 @@ msg_format("%^s
                /* RF6_INVULNER */
                case 160+3:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        /* Message */
                        if (!seen)
@@ -3396,7 +3396,7 @@ msg_format("%s
                /* RF6_BLINK */
                case 160+4:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (teleport_barrier(m_idx))
                        {
 #ifdef JP
@@ -3421,7 +3421,7 @@ msg_format("%s
                /* RF6_TPORT */
                case 160+5:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (teleport_barrier(m_idx))
                        {
 #ifdef JP
@@ -3446,7 +3446,7 @@ msg_format("%s
                case 160+6:
                {
                        int who = 0;
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if(m_ptr->r_idx == MON_DIO) who = 1;
                        else if(m_ptr->r_idx == MON_WONG) who = 3;
                        dam = who;
@@ -3459,7 +3459,7 @@ msg_format("%s
                {
                        int k;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
                        switch (m_ptr->r_idx)
                        {
                        case MON_OHMU:
@@ -3554,7 +3554,7 @@ msg_format("%s
                        default:
                                if (r_ptr->d_char == 'B')
                                {
-                                       disturb(1, 0);
+                                       disturb(1, 1);
                                        if (one_in_(3) || !direct)
                                        {
 #ifdef JP
@@ -3633,7 +3633,7 @@ msg_format("%s
                case 160+8:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤ò°ú¤­Ìᤷ¤¿¡£", m_name);
 #else
@@ -3649,7 +3649,7 @@ msg_format("%^s
                case 160+9:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤Ë¥Æ¥ì¥Ý¡¼¥È¤µ¤»¤é¤ì¤¿¡£", m_name);
                        if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
@@ -3667,7 +3667,7 @@ msg_format("%^s
                case 160+10:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«´ñ̯¤Ê¸ÀÍÕ¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3711,7 +3711,7 @@ msg_print("
                case 160+11:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3733,7 +3733,7 @@ else msg_format("%^s
                case 160+12:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3760,7 +3760,7 @@ else msg_format("%^s
                /* RF6_TRAPS */
                case 160+13:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤Æ¼Ù°­¤ËÈù¾Ð¤ó¤À¡£", m_name);
 #else
@@ -3782,7 +3782,7 @@ else msg_format("%^s
                case 160+14:
                {
                        if (!direct) return (FALSE);
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 msg_format("%^s¤¬¤¢¤Ê¤¿¤Îµ­²±¤ò¾Ãµî¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£", m_name);
 #else
@@ -3815,7 +3815,7 @@ msg_print("
                /* RF6_RAISE_DEAD */
                case 160+15:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3834,7 +3834,7 @@ else msg_format("%^s
                /* RF6_S_KIN */
                case 160+16:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
                        if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
                        {
 #ifdef JP
@@ -3957,7 +3957,7 @@ else msg_format("%^s
                /* RF6_S_CYBER */
                case 160+17:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3983,7 +3983,7 @@ if (blind && count) msg_print("
                /* RF6_S_MONSTER */
                case 160+18:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4012,7 +4012,7 @@ if (blind && count) msg_print("
                /* RF6_S_MONSTERS */
                case 160+19:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4041,7 +4041,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_ANT */
                case 160+20:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4070,7 +4070,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_SPIDER */
                case 160+21:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4099,7 +4099,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_HOUND */
                case 160+22:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4128,7 +4128,7 @@ if (blind && count) msg_print("¿
                /* RF6_S_HYDRA */
                case 160+23:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4159,7 +4159,7 @@ if (blind && count) msg_print("¿
                {
                        int num = 1;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4205,7 +4205,7 @@ if (blind) msg_print("¿
                /* RF6_S_DEMON */
                case 160+25:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4234,7 +4234,7 @@ if (blind && count) msg_print("
                /* RF6_S_UNDEAD */
                case 160+26:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4263,7 +4263,7 @@ if (blind && count) msg_print("
                /* RF6_S_DRAGON */
                case 160+27:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4292,7 +4292,7 @@ if (blind && count) msg_print("
                /* RF6_S_HI_UNDEAD */
                case 160+28:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 
                        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))
                        {
@@ -4387,7 +4387,7 @@ msg_print("
                /* RF6_S_HI_DRAGON */
                case 160+29:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4419,7 +4419,7 @@ msg_print("¿
                /* RF6_S_AMBERITES */
                case 160+30:
                {
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -4456,7 +4456,7 @@ msg_print("
                        bool uniques_are_summoned = FALSE;
                        int non_unique_type = SUMMON_HI_UNDEAD;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
 if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else

diff --git a/src/mspells2.c b/src/mspells2.c
index 60e18a5..7883b2a 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -737,12 +737,12 @@ bool monst_spell_monst(int m_idx)
        /* Can the player be aware of this attack? */
        known = (m_ptr->cdis <= MAX_SIGHT) || (t_ptr->cdis <= MAX_SIGHT);
 
-       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Check for spell failure (inate attacks never fail) */
        if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2))))
        {
-               disturb(1, 0);
+               disturb(1, 1);
                /* Message */
 #ifdef JP
                if (see_m) msg_format("%^s¤Ï¼öʸ¤ò¾§¤¨¤è¤¦¤È¤·¤¿¤¬¼ºÇÔ¤·¤¿¡£", m_name);
@@ -825,7 +825,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -917,7 +917,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -958,7 +958,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -999,7 +999,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1040,7 +1040,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1080,7 +1080,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1121,7 +1121,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1162,7 +1162,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1203,7 +1203,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1244,7 +1244,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1285,7 +1285,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_JAIAN)
 #ifdef JP
@@ -1332,7 +1332,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1373,7 +1373,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1414,7 +1414,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1455,7 +1455,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1496,7 +1496,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1537,7 +1537,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1578,7 +1578,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_BOTEI)
 #ifdef JP
@@ -1625,7 +1625,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1666,7 +1666,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1706,7 +1706,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1747,7 +1747,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1786,7 +1786,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1826,7 +1826,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1865,7 +1865,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1905,7 +1905,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1951,7 +1951,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -1997,7 +1997,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_ROLENTO)
                                {
@@ -2060,7 +2060,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2106,7 +2106,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2144,7 +2144,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2182,7 +2182,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2226,7 +2226,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2264,7 +2264,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -2550,7 +2550,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (blind)
                                {
@@ -3135,7 +3135,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_m)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 #ifdef JP
                                msg_format("%s¤Ï̵½ý¤Îµå¤Î¼öʸ¤ò¾§¤¨¤¿¡£", m_name);
 #else
@@ -3229,7 +3229,7 @@ bool monst_spell_monst(int m_idx)
                        {
                                if (see_either)
                                {
-                                       disturb(1, 0);
+                                       disturb(1, 1);
 
 #ifdef JP
                                        msg_format("%^s¤Ï¼êÜØÃƤò¤Ð¤é¤Þ¤¤¤¿¡£", m_name);
@@ -3624,7 +3624,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 #ifdef JP
                                if (blind) msg_format("%^s¤¬²¿¤«¤ò¤Ä¤Ö¤ä¤¤¤¿¡£", m_name);
 #else
@@ -3651,7 +3651,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                if (m_ptr->r_idx == MON_SERPENT || m_ptr->r_idx == MON_ZOMBI_SERPENT)
                                {
@@ -3770,7 +3770,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬¥µ¥¤¥Ð¡¼¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -3807,7 +3807,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤ÇÃç´Ö¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -3837,7 +3837,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥â¥ó¥¹¥¿¡¼¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -3870,7 +3870,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥¢¥ê¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -3903,7 +3903,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥¯¥â¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -3936,7 +3936,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥Ï¥¦¥ó¥É¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -3969,7 +3969,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥Ò¥É¥é¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -4002,7 +4002,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤ÇÅ·»È¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -4044,7 +4044,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Çº®Æ٤εÜÄ¤é¥Ç¡¼¥â¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -4077,7 +4077,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -4110,7 +4110,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -4143,7 +4143,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%s¤¬ËâË¡¤Ç¥¢¥ó¥Ç¥Ã¥É¤ò¾¤´­¤·¤¿¡£", m_name);
@@ -4176,7 +4176,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤Ç¸ÅÂå¥É¥é¥´¥ó¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -4209,7 +4209,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬¥¢¥ó¥Ð¡¼¤Î²¦Â²¤ò¾¤´­¤·¤¿¡ª", m_name);
@@ -4242,7 +4242,7 @@ bool monst_spell_monst(int m_idx)
                {
                        if (see_either)
                        {
-                               disturb(1, 0);
+                               disturb(1, 1);
 
 #ifdef JP
                                msg_format("%^s¤¬ËâË¡¤ÇÆÃÊ̤ʶ¯Å¨¤ò¾¤´­¤·¤¿¡ª", m_name);

diff --git a/src/object2.c b/src/object2.c
index 941399b..1d9b8d1 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -6875,7 +6875,7 @@ bool process_warning(int xx, int yy)
                        else strcpy(o_name, "body"); /* Warning ability without item */
                        msg_format("Your %s pulsates sharply!", o_name);
 #endif
-                       disturb(0, 0);
+                       disturb(0, 1);
 #ifdef JP
                        return get_check("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©");
 #else
@@ -6899,7 +6899,7 @@ bool process_warning(int xx, int yy)
                else strcpy(o_name, "body"); /* Warning ability without item */
                msg_format("Your %s pulsates!", o_name);
 #endif
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                return get_check("ËÜÅö¤Ë¤³¤Î¤Þ¤Þ¿Ê¤à¤«¡©");
 #else

diff --git a/src/spells1.c b/src/spells1.c
index e1887b2..5147cd4 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1782,7 +1782,7 @@ static bool project_m(int who, int r, int y, int x, int dam, int typ, int flg, b
 #endif
 
 
-       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 0);
+       if (p_ptr->riding && (c_ptr->m_idx == p_ptr->riding)) disturb(1, 1);
 
        /* Analyze the damage type */
        switch (typ)
@@ -6424,7 +6424,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
                project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP|PROJECT_KILL|PROJECT_REFLECTABLE), monspell);
 
-               disturb(1, 0);
+               disturb(1, 1);
                return TRUE;
        }
 
@@ -7743,7 +7743,7 @@ static bool project_p(int who, cptr who_name, int r, int y, int x, int dam, int
 
 
        /* Disturb */
-       disturb(1, 0);
+       disturb(1, 1);
 
 
        if ((p_ptr->special_defense & NINJA_KAWARIMI) && dam && who && (who != p_ptr->riding))