From 71a820e7298a670c13bd68cb3e6f2274a4dc3ba9 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 8 Oct 2016 11:38:29 +0200 Subject: Remove unused parameter from disturb() --- src/cave.cc | 6 ++-- src/cave.hpp | 2 +- src/cmd1.cc | 20 +++++------ src/cmd2.cc | 16 ++++----- src/dungeon.cc | 32 ++++++++--------- src/files.cc | 2 +- src/melee1.cc | 8 ++--- src/melee2.cc | 110 ++++++++++++++++++++++++++++---------------------------- src/monster2.cc | 8 ++--- src/object1.cc | 2 +- src/spells1.cc | 10 +++--- src/xtra2.cc | 2 +- 12 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/cave.cc b/src/cave.cc index 1ef32839..4e804d81 100644 --- a/src/cave.cc +++ b/src/cave.cc @@ -4330,7 +4330,7 @@ void object_track(object_type *o_ptr) * * All disturbance cancels repeated commands, resting, and running. */ -void disturb(int) +void disturb() { /* Cancel auto-commands */ /* command_new = 0; */ @@ -4381,7 +4381,7 @@ void disturb_on_state() { if (options->disturb_state) { - disturb(0); + disturb(); } } @@ -4394,7 +4394,7 @@ void disturb_on_other() { if (options->disturb_other) { - disturb(1); + disturb(); } } diff --git a/src/cave.hpp b/src/cave.hpp index 66b16d82..5eade816 100644 --- a/src/cave.hpp +++ b/src/cave.hpp @@ -36,7 +36,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); +extern void disturb(); extern void disturb_on_state(); extern void disturb_on_other(); extern int is_quest(int level); diff --git a/src/cmd1.cc b/src/cmd1.cc index 564fa055..6b2214c3 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -585,7 +585,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, if (!effect || check_hit2(power, rlev, ac)) { /* Always disturbing */ - disturb(1); + disturb(); /* Describe the attack method */ switch (method) @@ -974,7 +974,7 @@ static void carried_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, case RBM_CHARGE: { /* Disturb */ - disturb(1); + disturb(); /* Message */ msg_format("%s misses %s.", symbiote_name(true).c_str(), t_name); @@ -1079,7 +1079,7 @@ static void incarnate_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, if (!effect || check_hit2(power, rlev, ac)) { /* Always disturbing */ - disturb(1); + disturb(); /* Describe the attack method */ switch (method) @@ -1465,7 +1465,7 @@ static void incarnate_monster_attack(s16b m_idx, bool_ *fear, bool_ *mdeath, case RBM_CHARGE: { /* Disturb */ - disturb(1); + disturb(); /* Message */ msg_format("You miss %s.", t_name); @@ -1899,7 +1899,7 @@ void py_attack(int y, int x, int max_blow) int weap; /* Disturb the player */ - disturb(0); + disturb(); if (r_info[p_ptr->body_monster].flags & RF_NEVER_BLOW) { @@ -2864,7 +2864,7 @@ void move_player_aux(int dir, int do_pickup, int run) oktomove = FALSE; /* Disturb the player */ - disturb(0); + disturb(); if (p_ptr->prob_travel) { @@ -3009,7 +3009,7 @@ void move_player_aux(int dir, int do_pickup, int run) if (c_ptr->feat == FEAT_SHOP) { /* Disturb */ - disturb(0); + disturb(); /* Hack -- Enter store */ command_new = '_'; @@ -3031,7 +3031,7 @@ void move_player_aux(int dir, int do_pickup, int run) else if (c_ptr->inscription) { /* Disturb */ - disturb(0); + disturb(); msg_format("There is an inscription here: %s", inscription_info[c_ptr->inscription].text); @@ -3793,7 +3793,7 @@ void run_step(int dir) msg_print("You cannot run in that direction."); /* Disturb */ - disturb(0); + disturb(); /* Done */ return; @@ -3813,7 +3813,7 @@ void run_step(int dir) if (run_test()) { /* Disturb */ - disturb(0); + disturb(); /* Done */ return; diff --git a/src/cmd2.cc b/src/cmd2.cc index dce9273d..11e70583 100644 --- a/src/cmd2.cc +++ b/src/cmd2.cc @@ -1117,7 +1117,7 @@ void do_cmd_open(void) } /* Cancel repeat unless we may continue */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -1265,7 +1265,7 @@ void do_cmd_close(void) } /* Cancel repeat unless we may continue */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -1694,7 +1694,7 @@ void do_cmd_tunnel(void) } /* Cancel repetition unless we can continue */ - if (!more) disturb(0); + if (!more) disturb(); } /* @@ -1897,7 +1897,7 @@ void do_cmd_bash(void) } /* Unless valid action taken, cancel bash */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -1980,7 +1980,7 @@ void do_cmd_alter(void) } /* Cancel repetition unless we can continue */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -2150,7 +2150,7 @@ static void do_cmd_walk_jump(int pickup) } /* Cancel repeat unless we may continue */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -2322,7 +2322,7 @@ static void do_cmd_unwalk() } /* Cancel repetition unless we can continue */ - if (!more) disturb(0); + if (!more) disturb(); } @@ -2420,7 +2420,7 @@ void do_cmd_stay(int pickup) if (c_ptr->feat == FEAT_SHOP) { /* Disturb */ - disturb(0); + disturb(); /* Hack -- enter store */ command_new = '_'; diff --git a/src/dungeon.cc b/src/dungeon.cc index e73c9ac5..e4946959 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -966,7 +966,7 @@ static void process_world_corruptions() } else { - disturb(0); + disturb(); msg_print("Your corruption takes over you, you teleport!"); teleport_player(50); } @@ -1650,7 +1650,7 @@ static void process_world(void) { /* Message */ msg_print("You faint from the lack of food."); - disturb(1); + disturb(); /* Hack -- faint (bypass free action) */ (void)set_paralyzed(1 + rand_int(5)); @@ -2577,7 +2577,7 @@ static void process_world(void) if (!be_silent) { cmsg_print(TERM_L_DARK, "The Black Breath saps your soul!"); - disturb(0); + disturb(); } } @@ -2616,7 +2616,7 @@ static void process_world(void) /* The light is now out */ else if (o_ptr->timeout < 1) { - disturb(0); + disturb(); cmsg_print(TERM_YELLOW, "Your light has gone out!"); } @@ -2625,7 +2625,7 @@ static void process_world(void) { if (options->disturb_minor) { - disturb(0); + disturb(); } cmsg_print(TERM_YELLOW, "Your light is growing faint."); } @@ -2669,7 +2669,7 @@ static void process_world(void) if (p_ptr->csp < 0) { p_ptr->csp = 0; - disturb(0); + disturb(); } /* Redraw */ @@ -2688,7 +2688,7 @@ static void process_world(void) if (p_ptr->csp < 0) { p_ptr->csp = 0; - disturb(0); + disturb(); p_ptr->maintain_sum = 0; } @@ -2715,7 +2715,7 @@ static void process_world(void) if (p_ptr->chp == 0) { - disturb(0); + disturb(); } /* Redraw */ @@ -2776,7 +2776,7 @@ static void process_world(void) { if ((o_ptr->ident & IDENT_CURSED) && !p_ptr->anti_tele) { - disturb(0); + disturb(); /* Teleport player */ teleport_player(40); @@ -2789,7 +2789,7 @@ static void process_world(void) } else if (get_check("Teleport? ")) { - disturb(0); + disturb(); teleport_player(50); } } @@ -3122,7 +3122,7 @@ static void process_world(void) if (p_ptr->word_recall == 0) { /* Disturbing! */ - disturb(0); + disturb(); /* Determine the level */ if (p_ptr->inside_quest) @@ -4204,7 +4204,7 @@ static void process_player(void) /* Stop resting */ if ((p_ptr->chp == p_ptr->mhp) && (p_ptr->csp >= p_ptr->msp)) { - disturb(0); + disturb(); } } @@ -4235,7 +4235,7 @@ static void process_player(void) if (stop) { - disturb(0); + disturb(); } p_ptr->redraw |= (PR_FRAME); } @@ -4254,7 +4254,7 @@ static void process_player(void) flush(); /* Disturb */ - disturb(0); + disturb(); /* Hack -- Show a Message */ msg_print("Cancelled."); @@ -4307,7 +4307,7 @@ static void process_player(void) o_ptr = &p_ptr->inventory[item]; /* Disturbing */ - disturb(0); + disturb(); /* Warning */ msg_print("Your pack overflows!"); @@ -4645,7 +4645,7 @@ static void dungeon(void) /* Disturb */ - disturb(1); + disturb(); /* Track maximum player level */ if (p_ptr->max_plv < p_ptr->lev) diff --git a/src/files.cc b/src/files.cc index d073f7fc..9f1262b0 100644 --- a/src/files.cc +++ b/src/files.cc @@ -3976,7 +3976,7 @@ void do_cmd_save_game(void) if (!is_autosave) { /* Disturb the player */ - disturb(1); + disturb(); } /* Clear messages */ diff --git a/src/melee1.cc b/src/melee1.cc index 458e2fd3..1b20588a 100644 --- a/src/melee1.cc +++ b/src/melee1.cc @@ -280,7 +280,7 @@ bool_ carried_make_attack_normal(int r_idx) if (!effect || check_hit(power, rlev)) { /* Always disturbing */ - disturb(1); + disturb(); /* Hack -- Apply "protection from evil" */ if ((p_ptr->protevil > 0) && @@ -1165,7 +1165,7 @@ bool_ carried_make_attack_normal(int r_idx) case RBM_CHARGE: /* Disturbing */ - disturb(1); + disturb(); /* Message */ msg_format("%s misses you.", sym_name.c_str()); @@ -1388,7 +1388,7 @@ bool_ make_attack_normal(int m_idx, byte divis) int chance = p_ptr->dodge_chance - ((rlev * 5) / 6); /* Always disturbing */ - disturb(1); + disturb(); if ((chance > 0) && magik(chance)) { @@ -2681,7 +2681,7 @@ bool_ make_attack_normal(int m_idx, byte divis) if (m_ptr->ml) { /* Disturbing */ - disturb(1); + disturb(); /* Message */ msg_format("%^s misses you.", m_name); diff --git a/src/melee2.cc b/src/melee2.cc index 691021a5..0988d2af 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -2647,7 +2647,7 @@ static bool_ make_attack_spell(int m_idx) /* Do a breath */ auto do_breath = [&](char const *element, int gf, s32b max, int divisor, int smart_learn) -> void { // Interrupt - disturb(1); + disturb(); // Message if (blind) { @@ -2678,7 +2678,7 @@ static bool_ make_attack_spell(int m_idx) /* Do a summoning spell */ auto do_summon = [&](char const *action, int n, int type, summon_messages const &blind_msg) -> void { // Interrupt - disturb(1); + disturb(); // Message if (blind) { @@ -2713,7 +2713,7 @@ static bool_ make_attack_spell(int m_idx) { case SF_SHRIEK_IDX: { - disturb(1); + disturb(); msg_format("%^s makes a high pitched shriek.", m_name); aggravate_monsters(m_idx); break; @@ -2726,7 +2726,7 @@ static bool_ make_attack_spell(int m_idx) case SF_ROCKET_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s shoots something.", m_name); else msg_format("%^s fires a rocket.", m_name); breath(m_idx, GF_ROCKET, @@ -2737,7 +2737,7 @@ static bool_ make_attack_spell(int m_idx) case SF_ARROW_1_IDX: { - disturb(1); + disturb(); 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)); @@ -2747,7 +2747,7 @@ static bool_ make_attack_spell(int m_idx) case SF_ARROW_2_IDX: { - disturb(1); + disturb(); 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)); @@ -2757,7 +2757,7 @@ static bool_ make_attack_spell(int m_idx) case SF_ARROW_3_IDX: { - disturb(1); + disturb(); 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)); @@ -2767,7 +2767,7 @@ static bool_ make_attack_spell(int m_idx) case SF_ARROW_4_IDX: { - disturb(1); + disturb(); 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)); @@ -2897,7 +2897,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_NUKE_IDX: { - disturb(1); + disturb(); 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); @@ -2913,7 +2913,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_CHAO_IDX: { - disturb(1); + disturb(); 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); @@ -2929,7 +2929,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_ACID_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts an acid ball.", m_name); breath(m_idx, GF_ACID, @@ -2940,7 +2940,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_ELEC_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts a lightning ball.", m_name); breath(m_idx, GF_ELEC, @@ -2951,7 +2951,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_FIRE_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts a fire ball.", m_name); breath(m_idx, GF_FIRE, @@ -2962,7 +2962,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_COLD_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts a frost ball.", m_name); breath(m_idx, GF_COLD, @@ -2973,7 +2973,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_POIS_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts a stinking cloud.", m_name); breath(m_idx, GF_POIS, @@ -2984,7 +2984,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_NETH_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s casts a nether ball.", m_name); breath(m_idx, GF_NETHER, @@ -2995,7 +2995,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_WATE_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s gestures fluidly.", m_name); msg_print("You are engulfed in a whirlpool."); @@ -3006,7 +3006,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_MANA_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles powerfully.", m_name); else msg_format("%^s invokes a mana storm.", m_name); breath(m_idx, GF_MANA, @@ -3016,7 +3016,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BA_DARK_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles powerfully.", m_name); else msg_format("%^s invokes a darkness storm.", m_name); breath(m_idx, GF_DARK, @@ -3032,7 +3032,7 @@ static bool_ make_attack_spell(int m_idx) int r1; /* Disturb if legal */ - disturb(1); + disturb(); /* Basic message */ msg_format("%^s draws psychic energy from you!", m_name); @@ -3083,7 +3083,7 @@ static bool_ make_attack_spell(int m_idx) case SF_MIND_BLAST_IDX: { - disturb(1); + disturb(); if (!seen) { msg_print("You feel something focusing on your mind."); @@ -3118,7 +3118,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BRAIN_SMASH_IDX: { - disturb(1); + disturb(); if (!seen) { msg_print("You feel something focusing on your mind."); @@ -3165,7 +3165,7 @@ static bool_ make_attack_spell(int m_idx) case SF_CAUSE_1_IDX: { - disturb(1); + disturb(); 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) @@ -3182,7 +3182,7 @@ static bool_ make_attack_spell(int m_idx) case SF_CAUSE_2_IDX: { - disturb(1); + disturb(); 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) @@ -3199,7 +3199,7 @@ static bool_ make_attack_spell(int m_idx) case SF_CAUSE_3_IDX: { - disturb(1); + disturb(); 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) @@ -3216,7 +3216,7 @@ static bool_ make_attack_spell(int m_idx) case SF_CAUSE_4_IDX: { - disturb(1); + disturb(); 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) @@ -3233,7 +3233,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_ACID_IDX: { - disturb(1); + disturb(); 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)); @@ -3244,7 +3244,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_ELEC_IDX: { - disturb(1); + disturb(); 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)); @@ -3255,7 +3255,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_FIRE_IDX: { - disturb(1); + disturb(); 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)); @@ -3266,7 +3266,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_COLD_IDX: { - disturb(1); + disturb(); 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)); @@ -3283,7 +3283,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_NETH_IDX: { - disturb(1); + disturb(); 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); @@ -3294,7 +3294,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_WATE_IDX: { - disturb(1); + disturb(); 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)); @@ -3304,7 +3304,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_MANA_IDX: { - disturb(1); + disturb(); 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); @@ -3314,7 +3314,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_PLAS_IDX: { - disturb(1); + disturb(); 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)); @@ -3324,7 +3324,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BO_ICEE_IDX: { - disturb(1); + disturb(); 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)); @@ -3335,7 +3335,7 @@ static bool_ make_attack_spell(int m_idx) case SF_MISSILE_IDX: { - disturb(1); + disturb(); 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)); @@ -3345,7 +3345,7 @@ static bool_ make_attack_spell(int m_idx) case SF_SCARE_IDX: { - disturb(1); + disturb(); 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) @@ -3366,7 +3366,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BLIND_IDX: { - disturb(1); + disturb(); 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) @@ -3387,7 +3387,7 @@ static bool_ make_attack_spell(int m_idx) case SF_CONF_IDX: { - disturb(1); + disturb(); 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) @@ -3408,7 +3408,7 @@ static bool_ make_attack_spell(int m_idx) case SF_SLOW_IDX: { - disturb(1); + disturb(); msg_format("%^s drains power from your muscles!", m_name); if (p_ptr->free_act) { @@ -3428,7 +3428,7 @@ static bool_ make_attack_spell(int m_idx) case SF_HOLD_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s stares deep into your eyes!", m_name); if (p_ptr->free_act) @@ -3449,7 +3449,7 @@ static bool_ make_attack_spell(int m_idx) case SF_HASTE_IDX: { - disturb(1); + disturb(); if (blind) { msg_format("%^s mumbles.", m_name); @@ -3478,7 +3478,7 @@ static bool_ make_attack_spell(int m_idx) case SF_HAND_DOOM_IDX: { - disturb(1); + disturb(); msg_format("%^s invokes the Hand of Doom!", m_name); if (rand_int(100) < p_ptr->skill_sav) { @@ -3498,7 +3498,7 @@ static bool_ make_attack_spell(int m_idx) case SF_HEAL_IDX: { - disturb(1); + disturb(); /* Message */ if (blind) @@ -3561,7 +3561,7 @@ static bool_ make_attack_spell(int m_idx) case SF_BLINK_IDX: { - disturb(1); + disturb(); msg_format("%^s blinks away.", m_name); teleport_away(m_idx, 10); break; @@ -3569,7 +3569,7 @@ static bool_ make_attack_spell(int m_idx) case SF_TPORT_IDX: { - disturb(1); + disturb(); msg_format("%^s teleports away.", m_name); teleport_away(m_idx, MAX_SIGHT * 2 + 5); break; @@ -3577,7 +3577,7 @@ static bool_ make_attack_spell(int m_idx) case SF_TELE_TO_IDX: { - disturb(1); + disturb(); msg_format("%^s commands you to return.", m_name); teleport_player_to(m_ptr->fy, m_ptr->fx); break; @@ -3585,7 +3585,7 @@ static bool_ make_attack_spell(int m_idx) case SF_TELE_AWAY_IDX: { - disturb(1); + disturb(); msg_format("%^s teleports you away.", m_name); teleport_player(100); break; @@ -3593,7 +3593,7 @@ static bool_ make_attack_spell(int m_idx) case SF_TELE_LEVEL_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles strangely.", m_name); else msg_format("%^s gestures at your feet.", m_name); if (p_ptr->resist_nexus) @@ -3614,7 +3614,7 @@ static bool_ make_attack_spell(int m_idx) case SF_DARKNESS_IDX: { - disturb(1); + disturb(); if (blind) msg_format("%^s mumbles.", m_name); else msg_format("%^s gestures in shadow.", m_name); (void)unlite_area(0, 3); @@ -3623,7 +3623,7 @@ static bool_ make_attack_spell(int m_idx) case SF_FORGET_IDX: { - disturb(1); + disturb(); msg_format("%^s tries to blank your mind.", m_name); if (rand_int(100) < p_ptr->skill_sav) @@ -3781,7 +3781,7 @@ static bool_ make_attack_spell(int m_idx) case SF_S_UNIQUE_IDX: { // Interrupt - disturb(1); + disturb(); // Message if (blind) { @@ -5130,7 +5130,7 @@ static bool_ monst_attack_monst(int m_idx, int t_idx) if (m_ptr->ml) { /* Disturbing */ - disturb(1); + disturb(); /* Message */ monster_msg("%^s misses %s.", m_name, t_name); @@ -5844,7 +5844,7 @@ static void process_monster(int m_idx, bool_ is_frien) /* Disturb (sometimes) */ if (options->disturb_minor) { - disturb(0); + disturb(); } /* The door was bashed open */ @@ -6132,7 +6132,7 @@ static void process_monster(int m_idx, bool_ is_frien) { /* Disturb */ if ((is_friend(m_ptr) < 0) || options->disturb_pets) - disturb(0); + disturb(); } diff --git a/src/monster2.cc b/src/monster2.cc index 9b82130e..9fee393e 100644 --- a/src/monster2.cc +++ b/src/monster2.cc @@ -1774,7 +1774,7 @@ void update_mon(int m_idx, bool_ full) { if (options->disturb_pets || (is_friend(m_ptr) <= 0)) { - disturb(1); + disturb(); } } } @@ -1803,7 +1803,7 @@ void update_mon(int m_idx, bool_ full) { if (options->disturb_pets || (is_friend(m_ptr) <= 0)) { - disturb(1); + disturb(); } } } @@ -1833,7 +1833,7 @@ void update_mon(int m_idx, bool_ full) { if (options->disturb_pets || (is_friend(m_ptr) <= 0)) { - disturb(1); + disturb(); } } @@ -1857,7 +1857,7 @@ void update_mon(int m_idx, bool_ full) { if (options->disturb_pets || (is_friend(m_ptr) <= 0)) { - disturb(1); + disturb(); } } } diff --git a/src/object1.cc b/src/object1.cc index 8f1e5905..1eb9b484 100644 --- a/src/object1.cc +++ b/src/object1.cc @@ -5712,7 +5712,7 @@ static void absorb_gold(cave_type const *c_ptr) object_type *o_ptr = &o_list[this_o_idx]; /* Hack -- disturb */ - disturb(0); + disturb(); /* Pick up gold */ if (o_ptr->tval == TV_GOLD) diff --git a/src/spells1.cc b/src/spells1.cc index 7f03703d..05373942 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -233,7 +233,7 @@ void teleport_player_directed(int rad, int dir) if (c_ptr->feat == FEAT_SHOP) { /* Disturb */ - disturb(0); + disturb(); /* Hack -- enter store */ command_new = '_'; @@ -1240,7 +1240,7 @@ void take_hit(int damage, cptr hit_from) if (death) return; /* Disturb */ - disturb(1); + disturb(); /* Apply "invulnerability" */ if (p_ptr->invuln && (damage < 9000)) @@ -1478,7 +1478,7 @@ void take_sanity_hit(int damage, cptr hit_from) if (death) return; /* Disturb */ - disturb(1); + disturb(); /* Hurt the player */ @@ -6901,7 +6901,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); + disturb(); return TRUE; } @@ -7792,7 +7792,7 @@ static bool_ project_p(int who, int r, int y, int x, int dam, int typ, int a_rad /* Disturb */ - disturb(1); + disturb(); /* Return "Anything seen?" */ diff --git a/src/xtra2.cc b/src/xtra2.cc index 8e859f14..bbc82c68 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -3453,7 +3453,7 @@ void verify_panel(void) /* Hack -- optional disturb on "panel change" */ if (options->disturb_panel && !options->center_player) { - disturb(0); + disturb(); } /* Recalculate the boundaries */ -- cgit v1.2.3