Remove unused second parameter for disturb()

13 files changed, 260 insertions, 265 deletions

diff --git a/src/cave.c b/src/cave.c
index 9f26196a..2a02f017 100644
--- a/src/cave.c
+++ b/src/cave.c
@@ -4899,15 +4899,10 @@ void object_track(object_type *o_ptr)
  *
  * The first arg indicates a major disturbance, which affects search.
  *
- * The second arg is currently unused, but could induce output flush.
- *
  * All disturbance cancels repeated commands, resting, and running.
  */
-void disturb(int stop_search, int unused_flag)
+void disturb(int stop_search)
 {
-	/* Unused */
-	unused_flag = unused_flag;
-
 	/* Cancel auto-commands */
 	/* command_new = 0; */
 
diff --git a/src/cmd1.c b/src/cmd1.c
index 46fc15eb..ff493174 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -563,7 +563,7 @@ void search(void)
 					msg_print("You have found a trap.");
 
 					/* Disturb */
-					disturb(0, 0);
+					disturb(0);
 				}
 
 				/* Secret door */
@@ -578,7 +578,7 @@ void search(void)
 					lite_spot(y, x);
 
 					/* Disturb */
-					disturb(0, 0);
+					disturb(0);
 				}
 
 				/* Scan all objects in the grid */
@@ -609,7 +609,7 @@ void search(void)
 						object_known(o_ptr);
 
 						/* Notice it */
-						disturb(0, 0);
+						disturb(0);
 					}
 				}
 			}
@@ -645,7 +645,7 @@ static void hit_trap(void)
 
 
 	/* Disturb the player */
-	disturb(0, 0);
+	disturb(0);
 
 	/* Get the cave grid */
 	c_ptr = &cave[p_ptr->py][p_ptr->px];
@@ -815,7 +815,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath,
 		if (!effect || check_hit2(power, rlev, ac))
 		{
 			/* Always disturbing */
-			disturb(1, 0);
+			disturb(1);
 
 			/* Describe the attack method */
 			switch (method)
@@ -1208,7 +1208,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath,
 			case RBM_CHARGE:
 				{
 					/* Disturb */
-					disturb(1, 0);
+					disturb(1);
 
 					/* Message */
 					msg_format("%s misses %s.", sym_name, t_name);
@@ -1334,7 +1334,7 @@ static void incarnate_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath,
 		if (!effect || check_hit2(power, rlev, ac))
 		{
 			/* Always disturbing */
-			disturb(1, 0);
+			disturb(1);
 
 			/* Describe the attack method */
 			switch (method)
@@ -1727,7 +1727,7 @@ static void incarnate_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath,
 			case RBM_CHARGE:
 				{
 					/* Disturb */
-					disturb(1, 0);
+					disturb(1);
 
 					/* Message */
 					msg_format("You miss %s.", t_name);
@@ -2187,7 +2187,7 @@ void py_attack(int y, int x, int max_blow)
 	int weap;
 
 	/* Disturb the player */
-	disturb(0, 0);
+	disturb(0);
 
 	if (r_info[p_ptr->body_monster].flags1 & RF1_NEVER_BLOW)
 	{
@@ -3210,7 +3210,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		oktomove = FALSE;
 
 		/* Disturb the player */
-		disturb(0, 0);
+		disturb(0);
 
 		if (p_ptr->prob_travel)
 		{
@@ -3327,7 +3327,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 			energy_use = 0;
 		}
 
-		disturb(0, 0); 			/* To avoid a loop with running */
+		disturb(0); 			/* To avoid a loop with running */
 
 		oktomove = FALSE;
 	}
@@ -3350,7 +3350,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		if (old_dtrap && !new_dtrap)
 		{
 			/* Disturb player */
-			disturb(0, 0);
+			disturb(0);
 
 			/* but don't take a turn */
 			energy_use = 0;
@@ -3459,7 +3459,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		if (c_ptr->feat == FEAT_SHOP)
 		{
 			/* Disturb */
-			disturb(0, 0);
+			disturb(0);
 
 			/* Hack -- Enter store */
 			command_new = '_';
@@ -3482,7 +3482,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		                !(f_info[cave[y][x].feat].flags1 & FF1_DOOR))
 		{
 			/* Disturb */
-			disturb(0, 0);
+			disturb(0);
 
 			if (!(c_ptr->info & (CAVE_TRDT)))
 			{
@@ -3501,7 +3501,7 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 		else if (c_ptr->inscription)
 		{
 			/* Disturb */
-			disturb(0, 0);
+			disturb(0);
 
 			msg_format("There is an inscription here: %s",
 			           inscription_info[c_ptr->inscription].text);
@@ -4284,7 +4284,7 @@ void run_step(int dir)
 			msg_print("You cannot run in that direction.");
 
 			/* Disturb */
-			disturb(0, 0);
+			disturb(0);
 
 			/* Done */
 			return;
@@ -4304,7 +4304,7 @@ void run_step(int dir)
 		if (run_test())
 		{
 			/* Disturb */
-			disturb(0, 0);
+			disturb(0);
 
 			/* Done */
 			return;
@@ -4336,7 +4336,7 @@ void step_effects(int y, int x, int do_pickup)
 	if (cave[y][x].feat == FEAT_SHOP)
 	{
 		/* Disturb */
-		disturb(0, 0);
+		disturb(0);
 
 		/* Hack -- Enter store */
 		command_new = KTRL('V');
@@ -4346,7 +4346,7 @@ void step_effects(int y, int x, int do_pickup)
 	else if (cave[y][x].t_idx != 0)
 	{
 		/* Disturb */
-		disturb(0, 0);
+		disturb(0);
 
 		if (!(cave[y][x].info & CAVE_TRDT))
 		{
diff --git a/src/cmd2.c b/src/cmd2.c
index 28a3dc1e..67f25098 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -1225,7 +1225,7 @@ void do_cmd_open(void)
 	process_hooks(HOOK_OPEN, "(d)", is_quest(dun_level));
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -1378,7 +1378,7 @@ void do_cmd_close(void)
 	}
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -1822,7 +1822,7 @@ void do_cmd_tunnel(void)
 	}
 
 	/* Cancel repetition unless we can continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -2235,7 +2235,7 @@ void do_cmd_disarm(void)
 	}
 
 	/* Cancel repeat unless told not to */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -2444,7 +2444,7 @@ void do_cmd_bash(void)
 	}
 
 	/* Unless valid action taken, cancel bash */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -2532,7 +2532,7 @@ void do_cmd_alter(void)
 	}
 
 	/* Cancel repetition unless we can continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -2699,7 +2699,7 @@ static void do_cmd_walk_jump(int pickup, bool_ disarm)
 	}
 
 	/* Cancel repeat unless we may continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
@@ -2811,7 +2811,7 @@ void do_cmd_stay(int pickup)
 	if (c_ptr->feat == FEAT_SHOP)
 	{
 		/* Disturb */
-		disturb(0, 0);
+		disturb(0);
 
 		/* Hack -- enter store */
 		command_new = '_';
@@ -4364,7 +4364,7 @@ void do_cmd_unwalk()
 	}
 
 	/* Cancel repetition unless we can continue */
-	if (!more) disturb(0, 0);
+	if (!more) disturb(0);
 }
 
 
diff --git a/src/dungeon.c b/src/dungeon.c
index 5b462bb8..5f3d9ab6 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1013,7 +1013,7 @@ static void process_world_corruptions()
 				}
 				else
 				{
-					disturb(0, 0);
+					disturb(0);
 					msg_print("Your corruption takes over you, you teleport!");
 					teleport_player(50);
 				}
@@ -1800,7 +1800,7 @@ static void process_world(void)
 			{
 				/* Message */
 				msg_print("You faint from the lack of food.");
-				disturb(1, 0);
+				disturb(1);
 
 				/* Hack -- faint (bypass free action) */
 				(void)set_paralyzed(1 + rand_int(5));
@@ -2443,7 +2443,7 @@ static void process_world(void)
 				att &= ~(CLASS_LEGS);
 				att &= ~(CLASS_WALL);
 
-				if (disturb_state) disturb(0, 0);
+				if (disturb_state) disturb(0);
 			}
 
 			p_ptr->update |= (PU_BODY);
@@ -2780,7 +2780,7 @@ static void process_world(void)
 		if (!be_silent)
 		{
 			cmsg_print(TERM_L_DARK, "The Black Breath saps your soul!");
-			disturb(0, 0);
+			disturb(0);
 		}
 	}
 
@@ -2819,14 +2819,14 @@ static void process_world(void)
 			/* The light is now out */
 			else if (o_ptr->timeout < 1)
 			{
-				disturb(0, 0);
+				disturb(0);
 				cmsg_print(TERM_YELLOW, "Your light has gone out!");
 			}
 
 			/* The light is getting dim */
 			else if ((o_ptr->timeout < 100) && (o_ptr->timeout % 10 == 0))
 			{
-				if (disturb_minor) disturb(0, 0);
+				if (disturb_minor) disturb(0);
 				cmsg_print(TERM_YELLOW, "Your light is growing faint.");
 			}
 		}
@@ -2869,7 +2869,7 @@ static void process_world(void)
 		if (p_ptr->csp < 0)
 		{
 			p_ptr->csp = 0;
-			disturb(0, 0);
+			disturb(0);
 		}
 
 		/* Redraw */
@@ -2888,7 +2888,7 @@ static void process_world(void)
 		if (p_ptr->csp < 0)
 		{
 			p_ptr->csp = 0;
-			disturb(0, 0);
+			disturb(0);
 
 			p_ptr->maintain_sum = 0;
 		}
@@ -2915,7 +2915,7 @@ static void process_world(void)
 
 		if (p_ptr->chp == 0)
 		{
-			disturb(0, 0);
+			disturb(0);
 		}
 
 		/* Redraw */
@@ -2976,7 +2976,7 @@ static void process_world(void)
 		{
 			if ((o_ptr->ident & IDENT_CURSED) && !p_ptr->anti_tele)
 			{
-				disturb(0, 0);
+				disturb(0);
 
 				/* Teleport player */
 				teleport_player(40);
@@ -2991,7 +2991,7 @@ static void process_world(void)
 				}
 				else if (get_check("Teleport? "))
 				{
-					disturb(0, 0);
+					disturb(0);
 					teleport_player(50);
 				}
 			}
@@ -3330,7 +3330,7 @@ static void process_world(void)
 			if (p_ptr->word_recall == 0)
 			{
 				/* Disturbing! */
-				disturb(0, 0);
+				disturb(0);
 
 				/* Determine the level */
 				if (p_ptr->inside_quest)
@@ -4554,7 +4554,7 @@ void process_player(void)
 			/* Stop resting */
 			if ((p_ptr->chp == p_ptr->mhp) && (p_ptr->csp >= p_ptr->msp))
 			{
-				disturb(0, 0);
+				disturb(0);
 			}
 		}
 
@@ -4585,7 +4585,7 @@ void process_player(void)
 
 			if (stop)
 			{
-				disturb(0, 0);
+				disturb(0);
 			}
 			p_ptr->redraw |= (PR_STATE);
 		}
@@ -4607,7 +4607,7 @@ void process_player(void)
 				flush();
 
 				/* Disturb */
-				disturb(0, 0);
+				disturb(0);
 
 				/* Hack -- Show a Message */
 				msg_print("Cancelled.");
@@ -4657,7 +4657,7 @@ void process_player(void)
 			o_ptr = &p_ptr->inventory[item];
 
 			/* Disturbing */
-			disturb(0, 0);
+			disturb(0);
 
 			/* Warning */
 			msg_print("Your pack overflows!");
@@ -5003,7 +5003,7 @@ static void dungeon(void)
 
 
 	/* Disturb */
-	disturb(1, 0);
+	disturb(1);
 
 	/* Track maximum player level */
 	if (p_ptr->max_plv < p_ptr->lev)
diff --git a/src/externs.h b/src/externs.h
index 28e99e1c..41b59cb3 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -614,7 +614,7 @@ extern void scatter(int *yp, int *xp, int y, int x, int d);
 extern void health_track(int m_idx);
 extern void monster_race_track(int r_idx, int ego);
 extern void object_track(object_type *o_ptr);
-extern void disturb(int stop_search, int flush_output);
+extern void disturb(int stop_search);
 extern int is_quest(int level);
 extern int random_quest_number(void);
 extern int new_effect(int type, int dam, int time, int cy, int cx, int rad, s32b flags);
diff --git a/src/files.c b/src/files.c
index c97315fc..d056c125 100644
--- a/src/files.c
+++ b/src/files.c
@@ -4216,7 +4216,7 @@ void do_cmd_save_game(void)
 	if (!is_autosave)
 	{
 		/* Disturb the player */
-		disturb(1, 0);
+		disturb(1);
 	}
 
 	/* Clear messages */
diff --git a/src/melee1.c b/src/melee1.c
index 157656a9..cc0f8ee3 100644
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -261,7 +261,7 @@ bool_ carried_make_attack_normal(int r_idx)
 		if (!effect || check_hit(power, rlev))
 		{
 			/* Always disturbing */
-			disturb(1, 0);
+			disturb(1);
 
 			/* Hack -- Apply "protection from evil" */
 			if ((p_ptr->protevil > 0) &&
@@ -1280,7 +1280,7 @@ bool_ carried_make_attack_normal(int r_idx)
 			case RBM_CHARGE:
 
 				/* Disturbing */
-				disturb(1, 0);
+				disturb(1);
 
 				/* Message */
 				msg_format("%s misses you.", sym_name);
@@ -1525,7 +1525,7 @@ bool_ make_attack_normal(int m_idx, byte divis)
 			int chance = p_ptr->dodge_chance - ((rlev * 5) / 6);
 
 			/* Always disturbing */
-			disturb(1, 0);
+			disturb(1);
 
 			if ((chance > 0) && magik(chance))
 			{
@@ -3011,7 +3011,7 @@ bool_ make_attack_normal(int m_idx, byte divis)
 				if (m_ptr->ml)
 				{
 					/* Disturbing */
-					disturb(1, 0);
+					disturb(1);
 
 					/* Message */
 					msg_format("%^s misses you.", m_name);
diff --git a/src/melee2.c b/src/melee2.c
index bc3fc75b..0a139f89 100644
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -1156,7 +1156,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 96 + 0:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_m) monster_msg("You hear a shriek.");
 				else monster_msg("%^s shrieks at %s.", m_name, t_name);
 				wake_up = TRUE;
@@ -1172,7 +1172,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_S_ANIMAL */
 		case 96 + 2:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons an animal!", m_name);
 				for (k = 0; k < 1; k++)
@@ -1189,7 +1189,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_ROCKET */
 		case 96 + 3:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear an explosion!");
 				else if (blind) monster_msg("%^s shoots something.", m_name);
 				else monster_msg("%^s fires a rocket at %s.", m_name, t_name);
@@ -1201,7 +1201,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_ARROW_1 */
 		case 96 + 4:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear a strange noise.");
 				else if (blind) monster_msg("%^s makes a strange noise.", m_name);
 				else monster_msg("%^s fires an arrow at %s.", m_name, t_name);
@@ -1213,7 +1213,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_ARROW_2 */
 		case 96 + 5:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear a strange noise.");
 				else if (blind) monster_msg("%^s makes a strange noise.", m_name);
 				else monster_msg("%^s fires an arrow at %s.", m_name, t_name);
@@ -1225,7 +1225,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_ARROW_3 */
 		case 96 + 6:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 
 				if (!see_either) monster_msg("You hear a strange noise.");
 				else if (blind) monster_msg("%^s makes a strange noise.", m_name);
@@ -1239,7 +1239,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 96 + 7:
 			{
 				if (!see_either) monster_msg("You hear a strange noise.");
-				else if (disturb_other) disturb(1, 0);
+				else if (disturb_other) disturb(1);
 				if (blind) monster_msg("%^s makes a strange noise.", m_name);
 				else monster_msg("%^s fires a missile at %s.", m_name, t_name);
 				sound(SOUND_SHOOT);
@@ -1250,7 +1250,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_ACID */
 		case 96 + 8:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes acid at %s.", m_name, t_name);
@@ -1263,7 +1263,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_ELEC */
 		case 96 + 9:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes lightning at %s.", m_name, t_name);
@@ -1276,7 +1276,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_FIRE */
 		case 96 + 10:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes fire at %s.", m_name, t_name);
@@ -1289,7 +1289,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_COLD */
 		case 96 + 11:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes frost at %s.", m_name, t_name);
@@ -1302,7 +1302,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_POIS */
 		case 96 + 12:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes gas at %s.", m_name, t_name);
@@ -1315,7 +1315,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_NETH */
 		case 96 + 13:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes nether at %s.", m_name, t_name);
@@ -1328,7 +1328,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_LITE */
 		case 96 + 14:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes light at %s.", m_name, t_name);
@@ -1341,7 +1341,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_DARK */
 		case 96 + 15:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes darkness at %s.", m_name, t_name);
@@ -1354,7 +1354,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_CONF */
 		case 96 + 16:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes confusion at %s.", m_name, t_name);
@@ -1367,7 +1367,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_SOUN */
 		case 96 + 17:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes sound at %s.", m_name, t_name);
@@ -1380,7 +1380,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_CHAO */
 		case 96 + 18:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes chaos at %s.", m_name, t_name);
@@ -1393,7 +1393,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_DISE */
 		case 96 + 19:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes disenchantment at %s.", m_name, t_name);
@@ -1406,7 +1406,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_NEXU */
 		case 96 + 20:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes nexus at %s.", m_name, t_name);
@@ -1419,7 +1419,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_TIME */
 		case 96 + 21:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes time at %s.", m_name, t_name);
@@ -1432,7 +1432,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_INER */
 		case 96 + 22:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes inertia at %s.", m_name, t_name);
@@ -1445,7 +1445,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_GRAV */
 		case 96 + 23:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes gravity at %s.", m_name, t_name);
@@ -1458,7 +1458,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_SHAR */
 		case 96 + 24:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes shards at %s.", m_name, t_name);
@@ -1471,7 +1471,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_PLAS */
 		case 96 + 25:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes plasma at %s.", m_name, t_name);
@@ -1484,7 +1484,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_WALL */
 		case 96 + 26:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes force at %s.", m_name, t_name);
@@ -1497,7 +1497,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_MANA */
 		case 96 + 27:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes magical energy at %s.", m_name, t_name);
@@ -1510,7 +1510,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BA_NUKE */
 		case 96 + 28:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear someone mumble.");
 				else if (blind) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a ball of radiation at %s.", m_name, t_name);
@@ -1523,7 +1523,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_NUKE */
 		case 96 + 29:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes toxic waste at %s.", m_name, t_name);
@@ -1536,7 +1536,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BA_CHAO */
 		case 96 + 30:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear someone mumble frighteningly.");
 				else if (blind) monster_msg("%^s mumbles frighteningly.", m_name);
 				else monster_msg("%^s invokes a raw Chaos upon %s.", m_name, t_name);
@@ -1549,7 +1549,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF4_BR_DISI -> Breathe Disintegration */
 		case 96 + 31:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg("You hear breathing noise.");
 				else if (blind) monster_msg("%^s breathes.", m_name);
 				else monster_msg("%^s breathes disintegration at %s.", m_name, t_name);
@@ -1562,7 +1562,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_ACID */
 		case 128 + 0:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else if (blind) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts an acid ball at %s.", m_name, t_name);
@@ -1573,7 +1573,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_ELEC */
 		case 128 + 1:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1585,7 +1585,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_FIRE */
 		case 128 + 2:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1597,7 +1597,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_COLD */
 		case 128 + 3:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1609,7 +1609,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_POIS */
 		case 128 + 4:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1621,7 +1621,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_NETH */
 		case 128 + 5:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1633,7 +1633,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_WATE */
 		case 128 + 6:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble.");
 				else
 					if (blind) monster_msg("%^s mumbles.", m_name);
@@ -1646,7 +1646,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_MANA */
 		case 128 + 7:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble powerfully.");
 				else
 					if (blind) monster_msg("%^s mumbles powerfully.", m_name);
@@ -1658,7 +1658,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BA_DARK */
 		case 128 + 8:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_either) monster_msg ("You hear someone mumble powerfully.");
 				else
 					if (blind) monster_msg("%^s mumbles powerfully.", m_name);
@@ -1713,7 +1713,7 @@ static bool_ monst_spell_monst(int m_idx)
 			{
 				if (!direct) break;
 
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 
 				if (!seen)
 				{
@@ -1758,7 +1758,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 11:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!seen)
 				{
 					/* */
@@ -1804,7 +1804,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 12:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s points at %s and curses.", m_name, t_name);
 				if (t_ptr->level > randint((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
@@ -1825,7 +1825,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 13:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s points at %s and curses horribly.", m_name, t_name);
 				if (t_ptr->level > randint((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
@@ -1845,7 +1845,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 14:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s points at %s, incanting terribly!", m_name, t_name);
 				if (t_ptr->level > randint((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
@@ -1865,7 +1865,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 15:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s points at %s, screaming the word 'DIE!'", m_name, t_name);
 				if (t_ptr->level > randint((rlev - 10) < 1 ? 1 : (rlev - 10)) + 10)
@@ -1884,7 +1884,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_ACID */
 		case 128 + 16:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts an acid bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_ACID,
@@ -1895,7 +1895,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_ELEC */
 		case 128 + 17:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a lightning bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_ELEC,
@@ -1906,7 +1906,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_FIRE */
 		case 128 + 18:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a fire bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_FIRE,
@@ -1917,7 +1917,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_COLD */
 		case 128 + 19:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a frost bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_COLD,
@@ -1935,7 +1935,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_NETH */
 		case 128 + 21:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a nether bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_NETHER,
@@ -1946,7 +1946,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_WATE */
 		case 128 + 22:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a water bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_WATER,
@@ -1957,7 +1957,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_MANA */
 		case 128 + 23:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a mana bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_MANA,
@@ -1968,7 +1968,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_PLAS */
 		case 128 + 24:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a plasma bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_PLASMA,
@@ -1979,7 +1979,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_BO_ICEE */
 		case 128 + 25:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts an ice bolt at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_ICE,
@@ -1990,7 +1990,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF5_MISSILE */
 		case 128 + 26:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a magic missile at %s.", m_name, t_name);
 				monst_bolt_monst(m_idx, y, x, GF_MISSILE,
@@ -2002,7 +2002,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 27:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles, and you hear scary noises.", m_name);
 				else monster_msg("%^s casts a fearful illusion at %s.", m_name, t_name);
 				if (tr_ptr->flags3 & RF3_NO_FEAR)
@@ -2026,7 +2026,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 28:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s casts a spell, burning %s%s eyes.", m_name, t_name,
 					                 (!strcmp(t_name, "it") ? "s" : "'s"));
@@ -2052,7 +2052,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 29:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles, and you hear puzzling noises.", m_name);
 				else monster_msg("%^s creates a mesmerising illusion in front of %s.", m_name, t_name);
 				if (tr_ptr->flags3 & RF3_NO_CONF)
@@ -2076,7 +2076,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 30:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!blind && see_either) monster_msg("%^s drains power from %s%s muscles.", m_name, t_name,
 					                                      (!strcmp(t_name, "it") ? "s" : "'s"));
 				if (tr_ptr->flags1 & RF1_UNIQUE)
@@ -2100,7 +2100,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 128 + 31:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!blind && see_m) monster_msg("%^s stares intently at %s.", m_name, t_name);
 				if ((tr_ptr->flags1 & RF1_UNIQUE) ||
 				                (tr_ptr->flags3 & RF3_NO_STUN))
@@ -2124,7 +2124,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_HASTE */
 		case 160 + 0:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m)
 				{
 					monster_msg("%^s mumbles.", m_name);
@@ -2155,7 +2155,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 160 + 1:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (!see_m) monster_msg("You hear someone invoke the Hand of Doom!");
 				else if (!blind) monster_msg("%^s invokes the Hand of Doom on %s.", m_name, t_name);
 				else
@@ -2186,7 +2186,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_HEAL */
 		case 160 + 2:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 
 				/* Message */
 				if (blind || !see_m)
@@ -2251,7 +2251,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_ANIMALS */
 		case 160 + 3:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons some animals!", m_name);
 				for (k = 0; k < 4; k++)
@@ -2268,7 +2268,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_BLINK */
 		case 160 + 4:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (see_m) monster_msg("%^s blinks away.", m_name);
 				teleport_away(m_idx, 10);
 				break;
@@ -2280,7 +2280,7 @@ static bool_ monst_spell_monst(int m_idx)
 				if (dungeon_flags2 & DF2_NO_TELEPORT) break;  /* No teleport on special levels */
 				else
 				{
-					if (disturb_other) disturb(1, 0);
+					if (disturb_other) disturb(1);
 					if (see_m) monster_msg("%^s teleports away.", m_name);
 					teleport_away(m_idx, MAX_SIGHT * 2 + 5);
 					break;
@@ -2303,7 +2303,7 @@ static bool_ monst_spell_monst(int m_idx)
 				else
 				{
 					bool_ resists_tele = FALSE;
-					if (disturb_other) disturb(1, 0);
+					if (disturb_other) disturb(1);
 					monster_msg("%^s teleports %s away.", m_name, t_name);
 
 
@@ -2349,7 +2349,7 @@ static bool_ monst_spell_monst(int m_idx)
 		case 160 + 9:
 			{
 				if (!direct) break;
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s gestures in shadow.", m_name);
 				if (seen)
@@ -2383,7 +2383,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_BUG */
 		case 160 + 13:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically codes some software bugs.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2400,7 +2400,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_RNG */
 		case 160 + 14:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically codes some RNGs.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2418,7 +2418,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_THUNDERLORD */
 		case 160 + 15:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons a Thunderlord!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2435,7 +2435,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_SUMMON_KIN */
 		case 160 + 16:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons %s %s.",
 					                 m_name, m_poss,
@@ -2458,7 +2458,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_HI_DEMON */
 		case 160 + 17:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons greater demons!", m_name);
 				if (blind && count) monster_msg("You hear heavy steps nearby.");
@@ -2472,7 +2472,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_MONSTER */
 		case 160 + 18:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons help!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2489,7 +2489,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_MONSTERS */
 		case 160 + 19:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons monsters!", m_name);
 				for (k = 0; k < 8; k++)
@@ -2506,7 +2506,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_ANT */
 		case 160 + 20:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons ants.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2523,7 +2523,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_SPIDER */
 		case 160 + 21:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons spiders.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2540,7 +2540,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_HOUND */
 		case 160 + 22:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons hounds.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2557,7 +2557,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_HYDRA */
 		case 160 + 23:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons hydras.", m_name);
 				for (k = 0; k < 6; k++)
@@ -2574,7 +2574,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_ANGEL */
 		case 160 + 24:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons an angel!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2591,7 +2591,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_DEMON */
 		case 160 + 25:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons a demon!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2608,7 +2608,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_UNDEAD */
 		case 160 + 26:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons an undead adversary!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2625,7 +2625,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_DRAGON */
 		case 160 + 27:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons a dragon!", m_name);
 				for (k = 0; k < 1; k++)
@@ -2642,7 +2642,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_HI_UNDEAD */
 		case 160 + 28:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons greater undead!", m_name);
 				for (k = 0; k < 8; k++)
@@ -2662,7 +2662,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_HI_DRAGON */
 		case 160 + 29:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons ancient dragons!", m_name);
 				for (k = 0; k < 8; k++)
@@ -2682,7 +2682,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_WRAITH */
 		case 160 + 30:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons a wraith!", m_name);
 
@@ -2702,7 +2702,7 @@ static bool_ monst_spell_monst(int m_idx)
 			/* RF6_S_UNIQUE */
 		case 160 + 31:
 			{
-				if (disturb_other) disturb(1, 0);
+				if (disturb_other) disturb(1);
 				if (blind || !see_m) monster_msg("%^s mumbles.", m_name);
 				else monster_msg("%^s magically summons special opponents!", m_name);
 				for (k = 0; k < 8; k++)
@@ -3154,7 +3154,7 @@ bool_ make_attack_spell(int m_idx)
 		case 96 + 0:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s makes a high pitched shriek.", m_name);
 				aggravate_monsters(m_idx);
 				break;
@@ -3169,7 +3169,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_S_ANIMAL */
 		case 96 + 2:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons an animal!", m_name);
 				for (k = 0; k < 1; k++)
@@ -3183,7 +3183,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_ROCKET */
 		case 96 + 3:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s shoots something.", m_name);
 				else msg_format("%^s fires a rocket.", m_name);
 				breath(m_idx, GF_ROCKET,
@@ -3195,7 +3195,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_ARROW_1 */
 		case 96 + 4:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s makes a strange noise.", m_name);
 				else msg_format("%^s fires an arrow.", m_name);
 				bolt(m_idx, GF_ARROW, damroll(1, 6));
@@ -3206,7 +3206,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_ARROW_2 */
 		case 96 + 5:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s makes a strange noise.", m_name);
 				else msg_format("%^s fires an arrow!", m_name);
 				bolt(m_idx, GF_ARROW, damroll(3, 6));
@@ -3217,7 +3217,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_ARROW_3 */
 		case 96 + 6:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s makes a strange noise.", m_name);
 				else msg_format("%^s fires a missile.", m_name);
 				bolt(m_idx, GF_ARROW, damroll(5, 6));
@@ -3228,7 +3228,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_ARROW_4 */
 		case 96 + 7:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s makes a strange noise.", m_name);
 				else msg_format("%^s fires a missile!", m_name);
 				bolt(m_idx, GF_ARROW, damroll(7, 6));
@@ -3239,7 +3239,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_ACID */
 		case 96 + 8:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes acid.", m_name);
 				breath(m_idx, GF_ACID,
@@ -3251,7 +3251,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_ELEC */
 		case 96 + 9:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes lightning.", m_name);
 				breath(m_idx, GF_ELEC,
@@ -3263,7 +3263,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_FIRE */
 		case 96 + 10:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes fire.", m_name);
 				breath(m_idx, GF_FIRE,
@@ -3275,7 +3275,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_COLD */
 		case 96 + 11:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes frost.", m_name);
 				breath(m_idx, GF_COLD,
@@ -3287,7 +3287,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_POIS */
 		case 96 + 12:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes gas.", m_name);
 				breath(m_idx, GF_POIS,
@@ -3300,7 +3300,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_NETH */
 		case 96 + 13:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes nether.", m_name);
 				breath(m_idx, GF_NETHER,
@@ -3312,7 +3312,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_LITE */
 		case 96 + 14:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes light.", m_name);
 				breath(m_idx, GF_LITE,
@@ -3324,7 +3324,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_DARK */
 		case 96 + 15:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes darkness.", m_name);
 				breath(m_idx, GF_DARK,
@@ -3336,7 +3336,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_CONF */
 		case 96 + 16:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes confusion.", m_name);
 				breath(m_idx, GF_CONFUSION,
@@ -3348,7 +3348,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_SOUN */
 		case 96 + 17:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes sound.", m_name);
 				breath(m_idx, GF_SOUND,
@@ -3360,7 +3360,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_CHAO */
 		case 96 + 18:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes chaos.", m_name);
 				breath(m_idx, GF_CHAOS,
@@ -3372,7 +3372,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_DISE */
 		case 96 + 19:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes disenchantment.", m_name);
 				breath(m_idx, GF_DISENCHANT,
@@ -3384,7 +3384,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_NEXU */
 		case 96 + 20:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes nexus.", m_name);
 				breath(m_idx, GF_NEXUS,
@@ -3396,7 +3396,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_TIME */
 		case 96 + 21:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes time.", m_name);
 				breath(m_idx, GF_TIME,
@@ -3407,7 +3407,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_INER */
 		case 96 + 22:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes inertia.", m_name);
 				breath(m_idx, GF_INERTIA,
@@ -3418,7 +3418,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_GRAV */
 		case 96 + 23:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes gravity.", m_name);
 				breath(m_idx, GF_GRAVITY,
@@ -3429,7 +3429,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_SHAR */
 		case 96 + 24:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes shards.", m_name);
 				breath(m_idx, GF_SHARDS,
@@ -3441,7 +3441,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_PLAS */
 		case 96 + 25:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes plasma.", m_name);
 				breath(m_idx, GF_PLASMA,
@@ -3452,7 +3452,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_WALL */
 		case 96 + 26:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes force.", m_name);
 				breath(m_idx, GF_FORCE,
@@ -3463,7 +3463,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_MANA */
 		case 96 + 27:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes magical energy.", m_name);
 				breath(m_idx, GF_MANA,
@@ -3474,7 +3474,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BA_NUKE */
 		case 96 + 28:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a ball of radiation.", m_name);
 				breath(m_idx, GF_NUKE, (rlev + damroll(10, 6)), 2);
@@ -3485,7 +3485,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_NUKE */
 		case 96 + 29:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes toxic waste.", m_name);
 				breath(m_idx, GF_NUKE,
@@ -3497,7 +3497,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BA_CHAO */
 		case 96 + 30:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles frighteningly.", m_name);
 				else msg_format("%^s invokes a raw chaos.", m_name);
 				breath(m_idx, GF_CHAOS, (rlev * 2) + damroll(10, 10), 4);
@@ -3508,7 +3508,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF4_BR_DISI -> Disintegration breath! */
 		case 96 + 31:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s breathes.", m_name);
 				else msg_format("%^s breathes disintegration.", m_name);
 				breath(m_idx, GF_DISINTEGRATE,
@@ -3521,7 +3521,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_ACID */
 		case 128 + 0:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts an acid ball.", m_name);
 				breath(m_idx, GF_ACID,
@@ -3533,7 +3533,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_ELEC */
 		case 128 + 1:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a lightning ball.", m_name);
 				breath(m_idx, GF_ELEC,
@@ -3545,7 +3545,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_FIRE */
 		case 128 + 2:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a fire ball.", m_name);
 				breath(m_idx, GF_FIRE,
@@ -3557,7 +3557,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_COLD */
 		case 128 + 3:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a frost ball.", m_name);
 				breath(m_idx, GF_COLD,
@@ -3569,7 +3569,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_POIS */
 		case 128 + 4:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a stinking cloud.", m_name);
 				breath(m_idx, GF_POIS,
@@ -3581,7 +3581,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_NETH */
 		case 128 + 5:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a nether ball.", m_name);
 				breath(m_idx, GF_NETHER,
@@ -3593,7 +3593,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_WATE */
 		case 128 + 6:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s gestures fluidly.", m_name);
 				msg_print("You are engulfed in a whirlpool.");
@@ -3605,7 +3605,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_MANA */
 		case 128 + 7:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles powerfully.", m_name);
 				else msg_format("%^s invokes a mana storm.", m_name);
 				breath(m_idx, GF_MANA,
@@ -3616,7 +3616,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BA_DARK */
 		case 128 + 8:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles powerfully.", m_name);
 				else msg_format("%^s invokes a darkness storm.", m_name);
 				breath(m_idx, GF_DARK,
@@ -3634,7 +3634,7 @@ bool_ make_attack_spell(int m_idx)
 					int r1;
 
 					/* Disturb if legal */
-					disturb(1, 0);
+					disturb(1);
 
 					/* Basic message */
 					msg_format("%^s draws psychic energy from you!", m_name);
@@ -3687,7 +3687,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 10:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (!seen)
 				{
 					msg_print("You feel something focusing on your mind.");
@@ -3724,7 +3724,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 11:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (!seen)
 				{
 					msg_print("You feel something focusing on your mind.");
@@ -3773,7 +3773,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 12:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s points at you and curses.", m_name);
 				if (rand_int(100) < p_ptr->skill_sav)
@@ -3792,7 +3792,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 13:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s points at you and curses horribly.", m_name);
 				if (rand_int(100) < p_ptr->skill_sav)
@@ -3811,7 +3811,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 14:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles loudly.", m_name);
 				else msg_format("%^s points at you, incanting terribly!", m_name);
 				if (rand_int(100) < p_ptr->skill_sav)
@@ -3830,7 +3830,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 15:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s screams the word 'DIE!'", m_name);
 				else msg_format("%^s points at you, screaming the word DIE!", m_name);
 				if (rand_int(100) < p_ptr->skill_sav)
@@ -3848,7 +3848,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_ACID */
 		case 128 + 16:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a acid bolt.", m_name);
 				bolt(m_idx, GF_ACID, damroll(7, 8) + (rlev / 3));
@@ -3860,7 +3860,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_ELEC */
 		case 128 + 17:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a lightning bolt.", m_name);
 				bolt(m_idx, GF_ELEC, damroll(4, 8) + (rlev / 3));
@@ -3872,7 +3872,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_FIRE */
 		case 128 + 18:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a fire bolt.", m_name);
 				bolt(m_idx, GF_FIRE, damroll(9, 8) + (rlev / 3));
@@ -3884,7 +3884,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_COLD */
 		case 128 + 19:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a frost bolt.", m_name);
 				bolt(m_idx, GF_COLD, damroll(6, 8) + (rlev / 3));
@@ -3903,7 +3903,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_NETH */
 		case 128 + 21:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a nether bolt.", m_name);
 				bolt(m_idx, GF_NETHER, 30 + damroll(5, 5) + (rlev * 3) / 2);
@@ -3915,7 +3915,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_WATE */
 		case 128 + 22:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a water bolt.", m_name);
 				bolt(m_idx, GF_WATER, damroll(10, 10) + (rlev));
@@ -3926,7 +3926,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_MANA */
 		case 128 + 23:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a mana bolt.", m_name);
 				bolt(m_idx, GF_MANA, randint(rlev * 7 / 2) + 50);
@@ -3937,7 +3937,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_PLAS */
 		case 128 + 24:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a plasma bolt.", m_name);
 				bolt(m_idx, GF_PLASMA, 10 + damroll(8, 7) + (rlev));
@@ -3948,7 +3948,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_BO_ICEE */
 		case 128 + 25:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts an ice bolt.", m_name);
 				bolt(m_idx, GF_ICE, damroll(6, 6) + (rlev));
@@ -3960,7 +3960,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF5_MISSILE */
 		case 128 + 26:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a magic missile.", m_name);
 				bolt(m_idx, GF_MISSILE, damroll(2, 6) + (rlev / 3));
@@ -3972,7 +3972,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 27:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles, and you hear scary noises.", m_name);
 				else msg_format("%^s casts a fearful illusion.", m_name);
 				if (p_ptr->resist_fear)
@@ -3995,7 +3995,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 28:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s casts a spell, burning your eyes!", m_name);
 				if (p_ptr->resist_blind)
@@ -4018,7 +4018,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 29:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles, and you hear puzzling noises.", m_name);
 				else msg_format("%^s creates a mesmerizing illusion.", m_name);
 				if (p_ptr->resist_conf)
@@ -4041,7 +4041,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 30:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s drains power from your muscles!", m_name);
 				if (p_ptr->free_act)
 				{
@@ -4063,7 +4063,7 @@ bool_ make_attack_spell(int m_idx)
 		case 128 + 31:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s stares deep into your eyes!", m_name);
 				if (p_ptr->free_act)
@@ -4087,7 +4087,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_HASTE */
 		case 160 + 0:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind)
 				{
 					msg_format("%^s mumbles.", m_name);
@@ -4117,7 +4117,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_HAND_DOOM */
 		case 160 + 1:
 			{
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s invokes the Hand of Doom!", m_name);
 				if (rand_int(100) < p_ptr->skill_sav)
 				{
@@ -4138,7 +4138,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_HEAL */
 		case 160 + 2:
 			{
-				disturb(1, 0);
+				disturb(1);
 
 				/* Message */
 				if (blind)
@@ -4202,7 +4202,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_ANIMALS */
 		case 160 + 3:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons some animals!", m_name);
 				for (k = 0; k < 4; k++)
@@ -4216,7 +4216,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_BLINK */
 		case 160 + 4:
 			{
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s blinks away.", m_name);
 				teleport_away(m_idx, 10);
 				break;
@@ -4225,7 +4225,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_TPORT */
 		case 160 + 5:
 			{
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s teleports away.", m_name);
 				teleport_away(m_idx, MAX_SIGHT * 2 + 5);
 				break;
@@ -4235,7 +4235,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 6:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s commands you to return.", m_name);
 				teleport_player_to(m_ptr->fy, m_ptr->fx);
 				break;
@@ -4245,7 +4245,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 7:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s teleports you away.", m_name);
 				teleport_player(100);
 				break;
@@ -4255,7 +4255,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 8:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles strangely.", m_name);
 				else msg_format("%^s gestures at your feet.", m_name);
 				if (p_ptr->resist_nexus)
@@ -4278,7 +4278,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 9:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s gestures in shadow.", m_name);
 				(void)unlite_area(0, 3);
@@ -4289,7 +4289,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 10:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles, and then cackles evilly.", m_name);
 				else msg_format("%^s casts a spell and cackles evilly.", m_name);
 				(void)trap_creation();
@@ -4300,7 +4300,7 @@ bool_ make_attack_spell(int m_idx)
 		case 160 + 11:
 			{
 				if (!direct) break;
-				disturb(1, 0);
+				disturb(1);
 				msg_format("%^s tries to blank your mind.", m_name);
 
 				if (rand_int(100) < p_ptr->skill_sav)
@@ -4321,7 +4321,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_BUG */
 		case 160 + 13:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically codes some software bugs.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4335,7 +4335,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_RNG */
 		case 160 + 14:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically codes some RNGs.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4349,7 +4349,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_THUNDERLORD */
 		case 160 + 15:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons a Thunderlord!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4363,7 +4363,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_SUMMON_KIN */
 		case 160 + 16:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons %s %s.",
 					                m_name, m_poss,
@@ -4383,7 +4383,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_HI_DEMON */
 		case 160 + 17:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons greater demons!", m_name);
 				if (blind && count) msg_print("You hear heavy steps nearby.");
@@ -4394,7 +4394,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_MONSTER */
 		case 160 + 18:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons help!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4408,7 +4408,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_MONSTERS */
 		case 160 + 19:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons monsters!", m_name);
 				for (k = 0; k < 8; k++)
@@ -4422,7 +4422,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_ANT */
 		case 160 + 20:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons ants.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4436,7 +4436,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_SPIDER */
 		case 160 + 21:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons spiders.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4450,7 +4450,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_HOUND */
 		case 160 + 22:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons hounds.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4464,7 +4464,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_HYDRA */
 		case 160 + 23:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons hydras.", m_name);
 				for (k = 0; k < 6; k++)
@@ -4478,7 +4478,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_ANGEL */
 		case 160 + 24:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons an angel!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4492,7 +4492,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_DEMON */
 		case 160 + 25:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons a demon!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4506,7 +4506,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_UNDEAD */
 		case 160 + 26:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons an undead adversary!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4520,7 +4520,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_DRAGON */
 		case 160 + 27:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons a dragon!", m_name);
 				for (k = 0; k < 1; k++)
@@ -4534,7 +4534,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_HI_UNDEAD */
 		case 160 + 28:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons greater undead!", m_name);
 				for (k = 0; k < 8; k++)
@@ -4551,7 +4551,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_HI_DRAGON */
 		case 160 + 29:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons ancient dragons!", m_name);
 				for (k = 0; k < 8; k++)
@@ -4568,7 +4568,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_WRAITH */
 		case 160 + 30:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons Wraith!", m_name);
 
@@ -4588,7 +4588,7 @@ bool_ make_attack_spell(int m_idx)
 			/* RF6_S_UNIQUE */
 		case 160 + 31:
 			{
-				disturb(1, 0);
+				disturb(1);
 				if (blind) msg_format("%^s mumbles.", m_name);
 				else msg_format("%^s magically summons special opponents!", m_name);
 				for (k = 0; k < 8; k++)
@@ -5542,7 +5542,7 @@ static bool_ monst_attack_monst(int m_idx, int t_idx)
 		if (!effect || check_hit2(power, rlev, ac))
 		{
 			/* Always disturbing */
-			if (disturb_other) disturb(1, 0);
+			if (disturb_other) disturb(1);
 
 			/* Describe the attack method */
 			switch (method)
@@ -5947,7 +5947,7 @@ static bool_ monst_attack_monst(int m_idx, int t_idx)
 					if (m_ptr->ml)
 					{
 						/* Disturbing */
-						disturb(1, 0);
+						disturb(1);
 
 						/* Message */
 						monster_msg("%^s misses %s.", m_name, t_name);
@@ -6742,7 +6742,7 @@ static void process_monster(int m_idx, bool_ is_frien)
 					msg_print("You hear a door burst open!");
 
 					/* Disturb (sometimes) */
-					if (disturb_minor) disturb(0, 0);
+					if (disturb_minor) disturb(0);
 
 					/* The door was bashed open */
 					did_bash_door = TRUE;
@@ -7044,7 +7044,7 @@ static void process_monster(int m_idx, bool_ is_frien)
 			{
 				/* Disturb */
 				if ((is_friend(m_ptr) < 0) || disturb_pets)
-					disturb(0, 0);
+					disturb(0);
 			}
 
 			/* Check for monster trap */
diff --git a/src/monster2.c b/src/monster2.c
index 9d79f73a..175bf991 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -1884,7 +1884,7 @@ void update_mon(int m_idx, bool_ full)
 			/* Disturb on appearance */
 			if (disturb_move)
 			{
-				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1, 0);
+				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1);
 			}
 		}
 
@@ -1924,7 +1924,7 @@ void update_mon(int m_idx, bool_ full)
 			/* Disturb on disappearance*/
 			if (disturb_move)
 			{
-				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1, 0);
+				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1);
 			}
 		}
 	}
@@ -1951,7 +1951,7 @@ void update_mon(int m_idx, bool_ full)
 			/* Disturb on appearance */
 			if (disturb_near)
 			{
-				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1, 0);
+				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1);
 			}
 
 		}
@@ -1972,7 +1972,7 @@ void update_mon(int m_idx, bool_ full)
 			/* Disturb on disappearance */
 			if (disturb_near)
 			{
-				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1, 0);
+				if (disturb_pets || (is_friend(m_ptr) <= 0)) disturb(1);
 			}
 		}
 	}
diff --git a/src/object1.c b/src/object1.c
index 72ccd5af..a5dbc3d5 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -6253,7 +6253,7 @@ void py_pickup_floor(int pickup)
 		next_o_idx = o_ptr->next_o_idx;
 
 		/* Hack -- disturb */
-		disturb(0, 0);
+		disturb(0);
 
 		/* Pick up gold */
 		if (o_ptr->tval == TV_GOLD)
diff --git a/src/spells1.c b/src/spells1.c
index 5aec03bf..45bea042 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -175,7 +175,7 @@ void teleport_player_directed(int rad, int dir)
 	if (c_ptr->feat == FEAT_SHOP)
 	{
 		/* Disturb */
-		disturb(0, 0);
+		disturb(0);
 
 		/* Hack -- enter store */
 		command_new = '_';
@@ -1294,7 +1294,7 @@ void take_hit(int damage, cptr hit_from)
 	if (death) return;
 
 	/* Disturb */
-	disturb(1, 0);
+	disturb(1);
 
 	/* Apply "invulnerability" */
 	if (p_ptr->invuln && (damage < 9000))
@@ -1527,7 +1527,7 @@ void take_sanity_hit(int damage, cptr hit_from)
 	if (death) return;
 
 	/* Disturb */
-	disturb(1, 0);
+	disturb(1);
 
 
 	/* Hurt the player */
@@ -7216,7 +7216,7 @@ static bool_ project_p(int who, int r, int y, int x, int dam, int typ, int a_rad
 
 		project(0, 0, t_y, t_x, dam, typ, (PROJECT_STOP | PROJECT_KILL));
 
-		disturb(1, 0);
+		disturb(1);
 		return TRUE;
 	}
 
@@ -8118,7 +8118,7 @@ static bool_ project_p(int who, int r, int y, int x, int dam, int typ, int a_rad
 
 
 	/* Disturb */
-	disturb(1, 0);
+	disturb(1);
 
 
 	/* Return "Anything seen?" */
diff --git a/src/traps.c b/src/traps.c
index 999f9acc..bb56bb20 100644
--- a/src/traps.c
+++ b/src/traps.c
@@ -1974,7 +1974,7 @@ void player_activate_door_trap(s16b y, s16b x)
 	                !(f_info[c_ptr->feat].flags1 & FF1_DOOR)) return;
 
 	/* Disturb */
-	disturb(0, 0);
+	disturb(0);
 
 	/* Message */
 	msg_print("You found a trap!");
diff --git a/src/xtra2.c b/src/xtra2.c
index 84f3b540..3e0a1800 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -119,7 +119,7 @@ bool_ set_parasite(int v, int r)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -173,7 +173,7 @@ static bool_ set_simple_field(
 
 	/* Disturb */
 	if (disturb_state)
-		disturb(0, 0);
+		disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -520,7 +520,7 @@ bool_ set_mimic(int v, int p, int level)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Redraw title */
 	p_ptr->redraw |= (PR_TITLE);
@@ -817,7 +817,7 @@ bool_ set_fast(int v, int p)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -1179,7 +1179,7 @@ bool_ set_tim_thunder(int v, int p1, int p2)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -1406,7 +1406,7 @@ bool_ set_tim_regen(int v, int p)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Handle stuff */
 	handle_stuff();
@@ -1546,7 +1546,7 @@ bool_ set_stun(int v)
 			/* None */
 		case 0:
 			msg_print("You are no longer stunned.");
-			if (disturb_state) disturb(0, 0);
+			if (disturb_state) disturb(0);
 			break;
 		}
 
@@ -1561,7 +1561,7 @@ bool_ set_stun(int v)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -1754,7 +1754,7 @@ bool_ set_cut(int v)
 			/* None */
 		case 0:
 			msg_print("You are no longer bleeding.");
-			if (disturb_state) disturb(0, 0);
+			if (disturb_state) disturb(0);
 			break;
 		}
 
@@ -1769,7 +1769,7 @@ bool_ set_cut(int v)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -1983,7 +1983,7 @@ bool_ set_food(int v)
 	if (!notice) return (FALSE);
 
 	/* Disturb */
-	if (disturb_state) disturb(0, 0);
+	if (disturb_state) disturb(0);
 
 	/* Recalculate bonuses */
 	p_ptr->update |= (PU_BONUS);
@@ -3690,7 +3690,7 @@ void verify_panel(void)
 	panel_col_min = pcol_min;
 
 	/* Hack -- optional disturb on "panel change" */
-	if (disturb_panel && !center_player) disturb(0, 0);
+	if (disturb_panel && !center_player) disturb(0);
 
 	/* Recalculate the boundaries */
 	panel_bounds();