diff --git a/common/main/multi.h b/common/main/multi.h index 56c731e97..041837164 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -292,7 +292,6 @@ void multi_send_cloak(void); void multi_send_decloak(void); void multi_send_create_powerup(int powerup_type, int segnum, int objnum, vms_vector *pos); void multi_send_play_sound(int sound_num, fix volume); -void multi_send_audio_taunt(int taunt_num); void multi_send_score(void); void multi_send_trigger(int trigger); void multi_send_hostage_door_status(int wallnum); diff --git a/d1x-rebirth/main/multi.c b/d1x-rebirth/main/multi.c index 1aef844c2..b62dae69b 100644 --- a/d1x-rebirth/main/multi.c +++ b/d1x-rebirth/main/multi.c @@ -2905,28 +2905,6 @@ multi_send_play_sound(int sound_num, fix volume) multi_send_data(multibuf, count, 0); } -void -multi_send_audio_taunt(int taunt_num) -{ -#ifdef AUDIO_TAUNTS - int audio_taunts[4] = { - // Begin addition by GF - SOUND_CONTROL_CENTER_WARNING_SIREN, - SOUND_HOMING_WARNING, - SOUND_CONTROL_CENTER_DESTROYED, - SOUND_MINE_BLEW_UP - // End addition by GF - }; - - - Assert(taunt_num >= 0); - Assert(taunt_num < 4); - - digi_play_sample( audio_taunts[taunt_num], F1_0 ); - multi_send_play_sound(audio_taunts[taunt_num], F1_0); -#endif -} - void multi_send_score(void) { diff --git a/d2x-rebirth/main/multi.c b/d2x-rebirth/main/multi.c index 76f2e708b..c5539e084 100644 --- a/d2x-rebirth/main/multi.c +++ b/d2x-rebirth/main/multi.c @@ -3168,28 +3168,6 @@ multi_send_play_sound(int sound_num, fix volume) multi_send_data(multibuf, count, 0); } -void -multi_send_audio_taunt(int taunt_num) -{ - return; // Taken out, awaiting sounds.. - -#if 0 - int audio_taunts[4] = { - SOUND_CONTROL_CENTER_WARNING_SIREN, - SOUND_HOSTAGE_RESCUED, - SOUND_REFUEL_STATION_GIVING_FUEL, - SOUND_BAD_SELECTION - }; - - - Assert(taunt_num >= 0); - Assert(taunt_num < 4); - - digi_play_sample( audio_taunts[taunt_num], F1_0 ); - multi_send_play_sound(audio_taunts[taunt_num], F1_0); -#endif -} - void multi_send_score(void) {