From ceb4551cfb0e3fd1bdf8bdb868e6758634486ecb Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Remove effectively dead sound() code --- src/cmd1.cc | 19 --------------- src/cmd2.cc | 29 ---------------------- src/cmd3.cc | 2 -- src/cmd6.cc | 27 -------------------- src/cmd7.cc | 18 -------------- src/defines.h | 77 ---------------------------------------------------------- src/dungeon.cc | 9 ------- src/melee1.cc | 42 -------------------------------- src/melee2.cc | 43 -------------------------------- src/object2.cc | 2 -- src/spells1.cc | 34 -------------------------- src/spells2.cc | 6 ----- src/store.cc | 18 -------------- src/util.cc | 10 -------- src/util.hpp | 1 - src/xtra2.cc | 7 ------ 16 files changed, 344 deletions(-) diff --git a/src/cmd1.cc b/src/cmd1.cc index ab3f29d9..71096f7f 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -1795,7 +1795,6 @@ static void py_attack_hand(int *k, monster_type *m_ptr, s32b *special) { if (!desc) msg_format("You hit %s in the groin with your knee!", m_name); - sound(SOUND_PAIN); special_effect = MA_KNEE; } else if (!desc) msg_format(ma_ptr->desc, m_name); @@ -2142,9 +2141,6 @@ void py_attack(int y, int x, int max_blow) /* Test for hit */ if (test_hit_norm(chance, m_ptr->ac, m_ptr->ml)) { - /* Sound */ - sound(SOUND_HIT); - /* Hack -- bare hands do one damage */ k = 1; @@ -2511,9 +2507,6 @@ void py_attack(int y, int x, int max_blow) /* Player misses */ else { - /* Sound */ - sound(SOUND_MISS); - backstab = FALSE; /* Clumsy! */ /* Message */ @@ -2535,9 +2528,6 @@ void py_attack(int y, int x, int max_blow) /* Hack -- delay fear messages */ if (fear && m_ptr->ml) { - /* Sound */ - sound(SOUND_FLEE); - /* Message */ msg_format("%^s flees in terror!", m_name); } @@ -2701,9 +2691,6 @@ static bool_ easy_open_door(int y, int x) /* Update some things */ p_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_MON_LITE); - /* Sound */ - sound(SOUND_OPENDOOR); - /* Experience */ gain_exp(1); } @@ -2730,9 +2717,6 @@ static bool_ easy_open_door(int y, int x) /* Update some things */ p_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_MON_LITE); - - /* Sound */ - sound(SOUND_OPENDOOR); } /* Result */ @@ -3086,9 +3070,6 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm) energy_use = 0; } } - - /* Sound */ - sound(SOUND_HITWALL); } /* diff --git a/src/cmd2.cc b/src/cmd2.cc index 059170d4..2a8d33e7 100644 --- a/src/cmd2.cc +++ b/src/cmd2.cc @@ -1072,9 +1072,6 @@ static bool_ do_cmd_open_aux(int y, int x, int dir) /* Update some things */ p_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_MON_LITE); - /* Sound */ - sound(SOUND_OPENDOOR); - /* Experience */ gain_exp(1); } @@ -1104,9 +1101,6 @@ static bool_ do_cmd_open_aux(int y, int x, int dir) /* Update some things */ p_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_MON_LITE); - - /* Sound */ - sound(SOUND_OPENDOOR); } /* Result */ @@ -1284,9 +1278,6 @@ static bool_ do_cmd_close_aux(int y, int x, int dir) /* Update some things */ p_ptr->update |= (PU_VIEW | PU_MONSTERS | PU_MON_LITE); - - /* Sound */ - sound(SOUND_SHUTDOOR); } /* Result */ @@ -1500,9 +1491,6 @@ static bool_ do_cmd_tunnel_aux(int y, int x, int dir) /* Get grid */ c_ptr = &cave[y][x]; - /* Sound */ - sound(SOUND_DIG); - /* Titanium */ if (f_ptr->flags & FF_PERMANENT) { @@ -1899,7 +1887,6 @@ static bool_ do_cmd_disarm_chest(int y, int x, s16b o_idx) else { msg_print("You set off a trap!"); - sound(SOUND_FAIL); chest_trap(y, x, o_idx); } @@ -2202,9 +2189,6 @@ static bool_ do_cmd_bash_aux(int y, int x, int dir) cave_set_feat(y, x, FEAT_OPEN); } - /* Sound */ - sound(SOUND_OPENDOOR); - /* Hack -- Fall through the door. Can't disarm while falling. */ move_player_aux(dir, always_pickup, 0, FALSE); @@ -3215,10 +3199,6 @@ void do_cmd_fire(void) } - /* Sound */ - sound(SOUND_SHOOT); - - /* Describe the object */ object_desc(o_name, q_ptr, FALSE, 3); @@ -3449,9 +3429,6 @@ void do_cmd_fire(void) { char m_name[80]; - /* Sound */ - sound(SOUND_FLEE); - /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0); @@ -3858,9 +3835,6 @@ void do_cmd_throw(void) { char m_name[80]; - /* Sound */ - sound(SOUND_FLEE); - /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0); @@ -4185,9 +4159,6 @@ void do_cmd_boomerang(void) { char m_name[80]; - /* Sound */ - sound(SOUND_FLEE); - /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0); diff --git a/src/cmd3.cc b/src/cmd3.cc index 4d9c0bcf..9a4e3fc2 100644 --- a/src/cmd3.cc +++ b/src/cmd3.cc @@ -653,7 +653,6 @@ void do_cmd_destroy(void) /* Message */ msg_format("You destroy %s.", o_name); - sound(SOUND_DESTITEM); /* Create an automatizer rule */ if (automatizer_create) @@ -1598,7 +1597,6 @@ bool_ do_cmd_sense_grid_mana() { if (flush_failure) flush(); msg_print("You failed to sense the grid's mana."); - sound(SOUND_FAIL); return FALSE; } diff --git a/src/cmd6.cc b/src/cmd6.cc index 661a950c..841c6684 100644 --- a/src/cmd6.cc +++ b/src/cmd6.cc @@ -1002,10 +1002,6 @@ void do_cmd_eat_food(void) /* Get the item */ object_type *o_ptr = get_object(item); - /* Sound */ - sound(SOUND_EAT); - - /* Take a turn */ energy_use = 100; @@ -2514,10 +2510,6 @@ void do_cmd_quaff_potion(void) object_type *o_ptr = get_object(item); - /* Sound */ - sound(SOUND_QUAFF); - - /* Take a turn */ energy_use = 100; @@ -3620,8 +3612,6 @@ void do_cmd_read_scroll(void) /* Hack -- allow certain scrolls to be "preserved" */ if (!used_up) return; - sound(SOUND_SCROLL); - /* Destroy scroll */ inc_stack_size(item, -1); } @@ -3762,7 +3752,6 @@ void do_cmd_use_staff(void) { if (flush_failure) flush(); msg_print("You failed to use the staff properly."); - sound(SOUND_FAIL); return; } @@ -3776,9 +3765,6 @@ void do_cmd_use_staff(void) } - /* Sound */ - sound(SOUND_ZAP); - /* Analyze the staff */ activate_stick(o_ptr, &obvious, &use_charge); @@ -3931,7 +3917,6 @@ void do_cmd_aim_wand(void) { if (flush_failure) flush(); msg_print("You failed to use the wand properly."); - sound(SOUND_FAIL); return; } @@ -3944,9 +3929,6 @@ void do_cmd_aim_wand(void) return; } - /* Sound */ - sound(SOUND_ZAP); - /* Analyze the wand */ activate_stick(o_ptr, &obvious, &use_charge); @@ -4223,8 +4205,6 @@ void do_cmd_zap_rod(void) /* Message */ msg_print("You failed to use the rod properly."); - sound(SOUND_FAIL); - return; } @@ -4249,9 +4229,6 @@ void do_cmd_zap_rod(void) /* Increase the timeout by the rod kind's pval. */ o_ptr->timeout -= cost; - /* Sound */ - sound(SOUND_ZAP); - /* Analyze the rod */ switch (o_ptr->pval) { @@ -4941,7 +4918,6 @@ void do_cmd_activate(void) { if (flush_failure) flush(); msg_print("You failed to activate it properly."); - sound(SOUND_FAIL); return; } @@ -4980,9 +4956,6 @@ void do_cmd_activate(void) /* Activate the item */ msg_print("You activate it..."); - /* Sound */ - sound(SOUND_ZAP); - /* New mostly unified activation code This has to be early to allow artifacts to override normal items -- neil */ diff --git a/src/cmd7.cc b/src/cmd7.cc index 42f82ea3..6aac9050 100644 --- a/src/cmd7.cc +++ b/src/cmd7.cc @@ -424,8 +424,6 @@ void do_cmd_mindcraft(void) msg_format("You failed to concentrate hard enough!"); - sound(SOUND_FAIL); - if (randint(100) < (chance / 2)) { /* Backfire */ @@ -463,8 +461,6 @@ void do_cmd_mindcraft(void) /* Successful spells */ else { - sound(SOUND_ZAP); - /* spell code */ switch (n) { @@ -953,8 +949,6 @@ void do_cmd_mimic(void) msg_format("You failed to concentrate hard enough!"); - sound(SOUND_FAIL); - if (randint(100) < (fail / 2)) { /* Backfire */ @@ -985,8 +979,6 @@ void do_cmd_mimic(void) /* Successful spells */ else { - sound(SOUND_ZAP); - /* spell code */ switch (n) { @@ -1599,8 +1591,6 @@ void do_cmd_powermage(void) msg_print("You failed to get the spell off!"); } - sound(SOUND_FAIL); - /* Let time pass */ if (is_magestaff()) energy_use = 80; else energy_use = 100; @@ -2211,7 +2201,6 @@ void do_cmd_necromancer(void) { if (flush_failure) flush(); msg_format("You failed to concentrate hard enough!"); - sound(SOUND_FAIL); if (randint(100) < (chance / 2)) { @@ -2255,8 +2244,6 @@ void do_cmd_necromancer(void) } else { - sound(SOUND_ZAP); - /* spell code */ switch (n) { @@ -2609,8 +2596,6 @@ int rune_exec(rune_spell *spell, int cost) msg_print("You failed to get the spell off!"); } - sound(SOUND_FAIL); - if (is_magestaff()) energy_use = 80; else energy_use = 100; @@ -4077,12 +4062,9 @@ void do_cmd_symbiotic(void) { if (flush_failure) flush(); msg_format("You failed to concentrate hard enough!"); - sound(SOUND_FAIL); } else { - sound(SOUND_ZAP); - /* spell code */ switch (n) { diff --git a/src/defines.h b/src/defines.h index 8c451ccb..14d7fe25 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2325,83 +2325,6 @@ -/*** Sound constants ***/ - - -#define SOUND_HIT 1 -#define SOUND_MISS 2 -#define SOUND_FLEE 3 -#define SOUND_DROP 4 -#define SOUND_KILL 5 -#define SOUND_LEVEL 6 -#define SOUND_DEATH 7 -#define SOUND_STUDY 8 -#define SOUND_TELEPORT 9 -#define SOUND_SHOOT 10 -#define SOUND_QUAFF 11 -#define SOUND_ZAP 12 -#define SOUND_WALK 13 -#define SOUND_TPOTHER 14 -#define SOUND_HITWALL 15 -#define SOUND_EAT 16 -#define SOUND_STORE1 17 -#define SOUND_STORE2 18 -#define SOUND_STORE3 19 -#define SOUND_STORE4 20 -#define SOUND_DIG 21 -#define SOUND_OPENDOOR 22 -#define SOUND_SHUTDOOR 23 -#define SOUND_TPLEVEL 24 -#define SOUND_SCROLL 25 -#define SOUND_BUY 26 -#define SOUND_SELL 27 -#define SOUND_WARN 28 -#define SOUND_ROCKET 29 /* Somebody's shooting rockets */ -#define SOUND_N_KILL 30 /* The player kills a non-living/undead monster */ -#define SOUND_U_KILL 31 /* The player kills a unique */ -#define SOUND_QUEST 32 /* The player has just completed a quest */ -#define SOUND_HEAL 33 /* The player was healed a little bit */ -#define SOUND_X_HEAL 34 /* The player was healed full health */ -#define SOUND_BITE 35 /* A monster bites you */ -#define SOUND_CLAW 36 /* A monster claws you */ -#define SOUND_M_SPELL 37 /* A monster casts a miscellaneous spell */ -#define SOUND_SUMMON 38 /* A monster casts a summoning spell */ -#define SOUND_BREATH 39 /* A monster breathes */ -#define SOUND_BALL 40 /* A monster casts a ball / bolt spell */ -#define SOUND_M_HEAL 41 /* A monster heals itself somehow */ -#define SOUND_ATK_SPELL 42 /* A monster casts a misc. offensive spell */ -#define SOUND_EVIL 43 /* Something nasty has just happened! */ -#define SOUND_TOUCH 44 /* A monster touches you */ -#define SOUND_STING 45 /* A monster stings you */ -#define SOUND_CRUSH 46 /* A monster crushes / envelopes you */ -#define SOUND_SLIME 47 /* A monster drools/spits/etc on you */ -#define SOUND_WAIL 48 /* A monster wails */ -#define SOUND_WINNER 49 /* Just won the game! */ -#define SOUND_FIRE 50 /* An item was burned */ -#define SOUND_ACID 51 /* An item was destroyed by acid */ -#define SOUND_ELEC 52 /* An item was destroyed by electricity */ -#define SOUND_COLD 53 /* An item was shattered */ -#define SOUND_ILLEGAL 54 /* Illegal command attempted */ -#define SOUND_FAIL 55 /* Fail to get a spell off / activate an item */ -#define SOUND_WAKEUP 56 /* A monster wakes up */ -#define SOUND_INVULN 57 /* Invulnerability! */ -#define SOUND_FALL 58 /* Falling through a trapdoor... */ -#define SOUND_PAIN 59 /* A monster is in pain! */ -#define SOUND_DESTITEM 60 /* An item was destroyed by misc. means */ -#define SOUND_MOAN 61 /* A monster makes a moan/beg/insult attack */ -#define SOUND_SHOW 62 /* A monster makes a "show" attack */ -#define SOUND_UNUSED 63 /* (no sound for gaze attacks) */ -#define SOUND_EXPLODE 64 /* Something (or somebody) explodes */ - -/* - * Mega-Hack -- maximum known sounds - */ -#define SOUND_MAX 65 - - - -/*** Hack ***/ - /* * Road flags diff --git a/src/dungeon.cc b/src/dungeon.cc index 417e8010..bc5ec69c 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -1863,9 +1863,6 @@ static void process_world(void) { bool_ old_quick = quick_messages; - /* Sound */ - sound(SOUND_DEATH); - /* Hack -- Note death */ if (!last_words) { @@ -1914,8 +1911,6 @@ static void process_world(void) bell(); } - sound(SOUND_WARN); - /* Message */ msg_print("*** LOW DEATHPOINT WARNING! ***"); msg_print(NULL); @@ -3182,9 +3177,6 @@ static void process_world(void) p_ptr->leaving = TRUE; p_ptr->wild_mode = FALSE; } - - /* Sound */ - sound(SOUND_TPLEVEL); } } } @@ -4189,7 +4181,6 @@ static void process_command(void) if (rand_int(100) < insanity) { get_rnd_line("error.txt", error_m); - sound(SOUND_ILLEGAL); msg_print(error_m); } else diff --git a/src/melee1.cc b/src/melee1.cc index 89e0660a..09de2cd9 100644 --- a/src/melee1.cc +++ b/src/melee1.cc @@ -315,14 +315,12 @@ bool_ carried_make_attack_normal(int r_idx) { act = "hits you."; do_cut = do_stun = 1; - sound(SOUND_HIT); break; } case RBM_TOUCH: { act = "touches you."; - sound(SOUND_TOUCH); break; } @@ -330,7 +328,6 @@ bool_ carried_make_attack_normal(int r_idx) { act = "punches you."; do_stun = 1; - sound(SOUND_HIT); break; } @@ -338,7 +335,6 @@ bool_ carried_make_attack_normal(int r_idx) { act = "kicks you."; do_stun = 1; - sound(SOUND_HIT); break; } @@ -346,7 +342,6 @@ bool_ carried_make_attack_normal(int r_idx) { act = "claws you."; do_cut = 1; - sound(SOUND_CLAW); break; } @@ -354,14 +349,12 @@ bool_ carried_make_attack_normal(int r_idx) { act = "bites you."; do_cut = 1; - sound(SOUND_BITE); break; } case RBM_STING: { act = "stings you."; - sound(SOUND_STING); break; } @@ -375,7 +368,6 @@ bool_ carried_make_attack_normal(int r_idx) { act = "butts you."; do_stun = 1; - sound(SOUND_HIT); break; } @@ -383,42 +375,36 @@ bool_ carried_make_attack_normal(int r_idx) { act = "crushes you."; do_stun = 1; - sound(SOUND_CRUSH); break; } case RBM_ENGULF: { act = "engulfs you."; - sound(SOUND_CRUSH); break; } case RBM_CHARGE: { act = "charges you."; - sound(SOUND_BUY); /* Note! This is "charges", not "charges at". */ break; } case RBM_CRAWL: { act = "crawls on you."; - sound(SOUND_SLIME); break; } case RBM_DROOL: { act = "drools on you."; - sound(SOUND_SLIME); break; } case RBM_SPIT: { act = "spits on you."; - sound(SOUND_SLIME); break; } @@ -437,14 +423,12 @@ bool_ carried_make_attack_normal(int r_idx) case RBM_WAIL: { act = "wails at you."; - sound(SOUND_WAIL); break; } case RBM_SPORE: { act = "releases spores at you."; - sound(SOUND_SLIME); break; } @@ -457,21 +441,18 @@ bool_ carried_make_attack_normal(int r_idx) case RBM_BEG: { act = "begs you for money."; - sound(SOUND_MOAN); break; } case RBM_INSULT: { act = desc_insult[rand_int(8)]; - sound(SOUND_MOAN); break; } case RBM_MOAN: { act = desc_moan[rand_int(4)]; - sound(SOUND_MOAN); break; } @@ -481,7 +462,6 @@ bool_ carried_make_attack_normal(int r_idx) act = "sings 'We are a happy family.'"; else act = "sings 'I love you, you love me.'"; - sound(SOUND_SHOW); break; } } @@ -1483,7 +1463,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "hits you."; do_cut = do_stun = 1; touched = TRUE; - sound(SOUND_HIT); break; } @@ -1491,7 +1470,6 @@ bool_ make_attack_normal(int m_idx, byte divis) { act = "touches you."; touched = TRUE; - sound(SOUND_TOUCH); break; } @@ -1500,7 +1478,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "punches you."; touched = TRUE; do_stun = 1; - sound(SOUND_HIT); break; } @@ -1509,7 +1486,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "kicks you."; touched = TRUE; do_stun = 1; - sound(SOUND_HIT); break; } @@ -1518,7 +1494,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "claws you."; touched = TRUE; do_cut = 1; - sound(SOUND_CLAW); break; } @@ -1527,7 +1502,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "bites you."; do_cut = 1; touched = TRUE; - sound(SOUND_BITE); break; } @@ -1535,7 +1509,6 @@ bool_ make_attack_normal(int m_idx, byte divis) { act = "stings you."; touched = TRUE; - sound(SOUND_STING); break; } @@ -1550,7 +1523,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "butts you."; do_stun = 1; touched = TRUE; - sound(SOUND_HIT); break; } @@ -1559,7 +1531,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "crushes you."; do_stun = 1; touched = TRUE; - sound(SOUND_CRUSH); break; } @@ -1567,7 +1538,6 @@ bool_ make_attack_normal(int m_idx, byte divis) { act = "engulfs you."; touched = TRUE; - sound(SOUND_CRUSH); break; } @@ -1575,7 +1545,6 @@ bool_ make_attack_normal(int m_idx, byte divis) { act = "charges you."; touched = TRUE; - sound(SOUND_BUY); /* Note! This is "charges", not "charges at". */ break; } @@ -1583,21 +1552,18 @@ bool_ make_attack_normal(int m_idx, byte divis) { act = "crawls on you."; touched = TRUE; - sound(SOUND_SLIME); break; } case RBM_DROOL: { act = "drools on you."; - sound(SOUND_SLIME); break; } case RBM_SPIT: { act = "spits on you."; - sound(SOUND_SLIME); break; } @@ -1617,14 +1583,12 @@ bool_ make_attack_normal(int m_idx, byte divis) case RBM_WAIL: { act = "wails at you."; - sound(SOUND_WAIL); break; } case RBM_SPORE: { act = "releases spores at you."; - sound(SOUND_SLIME); break; } @@ -1637,14 +1601,12 @@ bool_ make_attack_normal(int m_idx, byte divis) case RBM_BEG: { act = "begs you for money."; - sound(SOUND_MOAN); break; } case RBM_INSULT: { act = desc_insult[rand_int(8)]; - sound(SOUND_MOAN); break; } @@ -1654,7 +1616,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = desc_moan[rand_int(3) + 4]; else act = desc_moan[rand_int(4)]; - sound(SOUND_MOAN); break; } @@ -1664,7 +1625,6 @@ bool_ make_attack_normal(int m_idx, byte divis) act = "sings 'We are a happy family.'"; else act = "sings 'I love you, you love me.'"; - sound(SOUND_SHOW); break; } } @@ -2627,7 +2587,6 @@ bool_ make_attack_normal(int m_idx, byte divis) if (explode) { - sound(SOUND_EXPLODE); if (mon_take_hit(m_idx, m_ptr->hp + 1, &fear, NULL)) { blinked = FALSE; @@ -2767,7 +2726,6 @@ bool_ make_attack_normal(int m_idx, byte divis) /* Fear */ if (m_ptr->ml && fear) { - sound (SOUND_FLEE); msg_format("%^s flees in terror!", m_name); } diff --git a/src/melee2.cc b/src/melee2.cc index 6d025511..1cebfb0b 100644 --- a/src/melee2.cc +++ b/src/melee2.cc @@ -98,20 +98,6 @@ bool_ mon_take_hit_mon(int s_idx, int m_idx, int dam, bool_ *fear, cptr note) /* Extract monster name */ monster_desc(m_name, m_ptr, 0); - /* Make a sound */ - if ((r_ptr->flags & RF_DEMON) || - (r_ptr->flags & RF_UNDEAD) || - (r_ptr->flags & RF_STUPID) || - (r_ptr->flags & RF_NONLIVING) || - (strchr("Evg", r_ptr->d_char))) - { - sound(SOUND_N_KILL); - } - else - { - sound(SOUND_KILL); - } - /* Death by Missile/Spell attack */ if (note) { @@ -1147,7 +1133,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_SHOOT); monst_bolt_monst(m_idx, y, x, GF_ARROW, damroll(1, 6)); break; } @@ -1158,7 +1143,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_SHOOT); monst_bolt_monst(m_idx, y, x, GF_ARROW, damroll(3, 6)); break; } @@ -1170,7 +1154,6 @@ static bool_ monst_spell_monst(int m_idx) 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 a missile at %s.", m_name, t_name); - sound(SOUND_SHOOT); monst_bolt_monst(m_idx, y, x, GF_ARROW, damroll(5, 6)); break; } @@ -1181,7 +1164,6 @@ static bool_ monst_spell_monst(int m_idx) 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); monst_bolt_monst(m_idx, y, x, GF_ARROW, damroll(7, 6)); break; } @@ -1192,7 +1174,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_ACID, ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3)), 0); break; @@ -1204,7 +1185,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_ELEC, ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3)), 0); break; @@ -1216,7 +1196,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_FIRE, ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3)), 0); break; @@ -1228,7 +1207,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_COLD, ((m_ptr->hp / 3) > 1600 ? 1600 : (m_ptr->hp / 3)), 0); break; @@ -1240,7 +1218,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_POIS, ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3)), 0); break; @@ -1252,7 +1229,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_NETHER, ((m_ptr->hp / 6) > 550 ? 550 : (m_ptr->hp / 6)), 0); break; @@ -1264,7 +1240,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_LITE, ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6)), 0); break; @@ -1276,7 +1251,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_DARK, ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6)), 0); break; @@ -1288,7 +1262,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_CONFUSION, ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6)), 0); break; @@ -1300,7 +1273,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_SOUND, ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6)), 0); break; @@ -1312,7 +1284,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_CHAOS, ((m_ptr->hp / 6) > 600 ? 600 : (m_ptr->hp / 6)), 0); break; @@ -1324,7 +1295,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_DISENCHANT, ((m_ptr->hp / 6) > 500 ? 500 : (m_ptr->hp / 6)), 0); break; @@ -1336,7 +1306,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_NEXUS, ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3)), 0); break; @@ -1348,7 +1317,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_TIME, ((m_ptr->hp / 3) > 150 ? 150 : (m_ptr->hp / 3)), 0); break; @@ -1360,7 +1328,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_INERTIA, ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6)), 0); break; @@ -1372,7 +1339,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_GRAVITY, ((m_ptr->hp / 3) > 200 ? 200 : (m_ptr->hp / 3)), 0); break; @@ -1384,7 +1350,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_SHARDS, ((m_ptr->hp / 6) > 400 ? 400 : (m_ptr->hp / 6)), 0); break; @@ -1396,7 +1361,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_PLASMA, ((m_ptr->hp / 6) > 150 ? 150 : (m_ptr->hp / 6)), 0); break; @@ -1408,7 +1372,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_FORCE, ((m_ptr->hp / 6) > 200 ? 200 : (m_ptr->hp / 6)), 0); break; @@ -1420,7 +1383,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_MANA, ((m_ptr->hp / 3) > 250 ? 250 : (m_ptr->hp / 3)), 0); break; @@ -1432,7 +1394,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_NUKE, (rlev + damroll(10, 6)), 2); break; @@ -1444,7 +1405,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_NUKE, ((m_ptr->hp / 3) > 800 ? 800 : (m_ptr->hp / 3)), 0); break; @@ -1456,7 +1416,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_CHAOS, (rlev * 2) + damroll(10, 10), 4); break; @@ -1468,7 +1427,6 @@ static bool_ monst_spell_monst(int m_idx) 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); - sound(SOUND_BREATH); monst_breath_monst(m_idx, y, x, GF_DISINTEGRATE, ((m_ptr->hp / 3) > 300 ? 300 : (m_ptr->hp / 3)), 0); break; @@ -5552,7 +5510,6 @@ static bool_ monst_attack_monst(int m_idx, int t_idx) if (explode) { - sound(SOUND_EXPLODE); mon_take_hit_mon(m_idx, m_idx, m_ptr->hp + 1, &fear, " explodes into tiny shreds."); blinked = FALSE; diff --git a/src/object2.cc b/src/object2.cc index 8e16fe48..ee001427 100644 --- a/src/object2.cc +++ b/src/object2.cc @@ -5293,8 +5293,6 @@ s16b drop_near(object_type *j_ptr, int chance, int y, int x) if (chance && (by == p_ptr->py) && (bx == p_ptr->px)) { msg_print("You feel something roll beneath your feet."); - /* Sound */ - sound(SOUND_DROP); } /* XXX XXX XXX */ diff --git a/src/spells1.cc b/src/spells1.cc index daee9f03..58cf1fd7 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -220,9 +220,6 @@ void teleport_player_directed(int rad, int dir) } - /* Sound */ - sound(SOUND_TELEPORT); - /* Move player */ teleport_player_to(y, x); @@ -330,9 +327,6 @@ void teleport_away(int m_idx, int dis) if (tries > MAX_TRIES) return; } - /* Sound */ - sound(SOUND_TPOTHER); - /* Update the new location */ cave[ny][nx].m_idx = m_idx; last_teleportation_y = ny; @@ -449,9 +443,6 @@ static void teleport_to_player(int m_idx) if (attempts < 1) return; - /* Sound */ - sound(SOUND_TPOTHER); - /* Update the new location */ cave[ny][nx].m_idx = m_idx; last_teleportation_y = ny; @@ -571,9 +562,6 @@ void teleport_player(int dis) if (tries > MAX_TRIES) return; } - /* Sound */ - sound(SOUND_TELEPORT); - /* Save the old location */ oy = p_ptr->py; ox = p_ptr->px; @@ -754,9 +742,6 @@ void teleport_monster_to(int m_idx, int ny, int nx) } } - /* Sound */ - sound(SOUND_TPOTHER); - /* Save the old position */ oy = m_ptr->fy; ox = m_ptr->fx; @@ -833,9 +818,6 @@ void teleport_player_to(int ny, int nx) } } - /* Sound */ - sound(SOUND_TELEPORT); - /* Save the old location */ oy = p_ptr->py; ox = p_ptr->px; @@ -961,9 +943,6 @@ void teleport_player_level(void) /* Leaving */ p_ptr->leaving = TRUE; } - - /* Sound */ - sound(SOUND_TPLEVEL); } @@ -1343,9 +1322,6 @@ void take_hit(int damage, cptr hit_from) /* Necromancers get a special treatment */ if (((!has_ability(AB_UNDEAD_FORM)) || ((p_ptr->necro_extra & CLASS_UNDEAD)))) { - /* Sound */ - sound(SOUND_DEATH); - /* Hack -- Note death */ if (!last_words) { @@ -1415,8 +1391,6 @@ void take_hit(int damage, cptr hit_from) bell(); } - sound(SOUND_WARN); - /* Message */ if (p_ptr->necro_extra & CLASS_UNDEAD) cmsg_print(TERM_RED, "*** LOW DEATHPOINT WARNING! ***"); @@ -1514,9 +1488,6 @@ void take_sanity_hit(int damage, cptr hit_from) /* Dead player */ if (p_ptr->csane < 0) { - /* Sound */ - sound(SOUND_DEATH); - /* Hack -- Note death */ cmsg_print(TERM_VIOLET, "You turn into an unthinking vegetable."); if (!last_words) @@ -1559,8 +1530,6 @@ void take_sanity_hit(int damage, cptr hit_from) bell(); } - sound(SOUND_WARN); - /* Message */ cmsg_print(TERM_RED, "*** LOW SANITY WARNING! ***"); msg_print(NULL); @@ -6864,9 +6833,6 @@ bool_ project_m(int who, int r, int y, int x, int dam, int typ) /* Take note */ if ((fear || do_fear) && (m_ptr->ml)) { - /* Sound */ - sound(SOUND_FLEE); - /* Message */ msg_format("%^s flees in terror!", m_name); } diff --git a/src/spells2.cc b/src/spells2.cc index 15df2f37..da7f9ffc 100644 --- a/src/spells2.cc +++ b/src/spells2.cc @@ -5140,8 +5140,6 @@ void teleport_swap(int dir) } else { - sound(SOUND_TELEPORT); - cave[p_ptr->py][p_ptr->px].m_idx = c_ptr->m_idx; /* Update the old location */ @@ -5223,8 +5221,6 @@ void swap_position(int lty, int ltx) if (!c_ptr->m_idx) { - sound(SOUND_TELEPORT); - /* Keep trace of the old location */ tx = p_ptr->px; ty = p_ptr->py; @@ -5261,8 +5257,6 @@ void swap_position(int lty, int ltx) { m_ptr = &m_list[c_ptr->m_idx]; - sound(SOUND_TELEPORT); - cave[p_ptr->py][p_ptr->px].m_idx = c_ptr->m_idx; /* Update the old location */ diff --git a/src/store.cc b/src/store.cc index 566a7ce0..64b75c3e 100644 --- a/src/store.cc +++ b/src/store.cc @@ -178,9 +178,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess) { /* Comment */ msg_print(comment_7a[rand_int(MAX_COMMENT_7A)]); - - /* Sound */ - sound(SOUND_STORE1); } /* Item was cheaper than we thought, and we paid more than necessary */ @@ -188,9 +185,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess) { /* Comment */ msg_print(comment_7b[rand_int(MAX_COMMENT_7B)]); - - /* Sound */ - sound(SOUND_STORE2); } /* Item was a good bargain, and we got away with it */ @@ -198,9 +192,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess) { /* Comment */ msg_print(comment_7c[rand_int(MAX_COMMENT_7C)]); - - /* Sound */ - sound(SOUND_STORE3); } /* Item was a great bargain, and we got away with it */ @@ -208,9 +199,6 @@ static void purchase_analyze(s32b price, s32b value, s32b guess) { /* Comment */ msg_print(comment_7d[rand_int(MAX_COMMENT_7D)]); - - /* Sound */ - sound(SOUND_STORE4); } } @@ -2227,9 +2215,6 @@ void store_purchase(void) /* Say "okay" */ say_comment_1(); - /* Make a sound */ - sound(SOUND_BUY); - /* Spend the money */ p_ptr->au -= price; @@ -2524,9 +2509,6 @@ void store_sell(void) /* Say "okay" */ say_comment_1(); - /* Make a sound */ - sound(SOUND_SELL); - /* Get some money */ p_ptr->au += price; diff --git a/src/util.cc b/src/util.cc index f4f6c64e..d9805f47 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1239,16 +1239,6 @@ void bell(void) } -/* -* Hack -- Make a (relevant?) sound -*/ -void sound(int val) -{ - /* Ignore; sound not currently supported. */ - return; -} - - /* * Helper function called only from "inkey()" diff --git a/src/util.hpp b/src/util.hpp index 06832a41..c682b2f2 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -24,7 +24,6 @@ extern errr fd_read(int fd, char *buf, huge n); extern errr fd_write(int fd, cptr buf, huge n); extern errr fd_close(int fd); extern void flush(void); -extern void sound(int num); extern void move_cursor(int row, int col); extern void text_to_ascii(char *buf, cptr str); extern void ascii_to_text(char *buf, cptr str); diff --git a/src/xtra2.cc b/src/xtra2.cc index 93a0603b..580d55a9 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -2006,9 +2006,6 @@ void check_experience(void) } } - /* Sound */ - sound(SOUND_LEVEL); - /* Message */ cmsg_format(TERM_L_GREEN, "Welcome to level %d.", p_ptr->lev); @@ -3097,10 +3094,6 @@ bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note) msg_format("%^s says: %s", m_name, line_got); } - - /* Make a sound */ - sound(SOUND_KILL); - /* Death by Missile/Spell attack */ if (note) { -- cgit v1.2.3