change!: remove support for Dune II - The Maker MT-32 soundtrack, sin…

…ce it is a subset of Shaiwa's (FED2k) MT-32 recordings.

BREAKING CHANGE: if you use this sountrack, please download and use Shaiwa's (FED2k) MT-32 package instead.

README.md

@@ -305,7 +305,6 @@ Here is a list of supported Music packs:
   - [rcblanke's SC-55 recording](https://www.vogons.org/viewtopic.php?t=33823&start=42)
   - [ShaiWa's (FED2k) MT-32 recording](https://forum.dune2k.com/files/file/116-dune2_mt32zip/)
   - [Dune II - The Maker AdLib recording](https://dune2themaker.fundynamic.com/downloads/mp3adlib.zip)
-  - [Dune II - The Maker MT-32 recording](https://dune2themaker.fundynamic.com/downloads/mp3mt32.zip)
   - [Dune II - The Maker SC-55 recording](https://dune2themaker.fundynamic.com/downloads/mp3sc55.zip)
   - [PC speaker recording](https://forum.dune2k.com/files/file/1517-pc-speaker-recording-all-tracks/)
 - [___Dune II___ Sega Mega Drive music](http://nyerguds.arsaneus-design.com/dune/dunesega/)  

dist/dunedynasty.cfg-sample

@@ -99,7 +99,6 @@ fluidsynth=1
 fed2k_mt32=1
 rcblanke_sc55=1
 d2tm_adlib=1
-d2tm_mt32=1 # Subset of fed2k_mt32.
 d2tm_sc55=1
 dune2_smd=1
 dune2_pcspeaker=1

dist/music/music.cfg

@@ -30,12 +30,12 @@
 ; dune7.ADL/6	= f # Menu
 ; dune16.ADL/7	= f # Conquest          -- Missing in: dune2000.
 ; dune0.ADL/2	= f # Intro             -- Missing in: d2tm_adlib, dune2_smd, dune2000.
-; dune19.ADL/4	= f # Finale Harkonnen  -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2_smd, dune2000.
-; dune19.ADL/2	= f # Finale Atreides   -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2_smd, dune2000.
-; dune19.ADL/3	= f # Finale Ordos      -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2_smd, dune2000.
-; dune0.ADL/4	= f # Logos             -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2_smd, dune2000.
-; dune16.ADL/8	= f # Cutscene          -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2_smd, dune2000.
-; dune20.ADL/2	= f # Credits           -- Missing in: d2tm_adlib, d2tm_mt32, d2tm_sc55, dune2000.
+; dune19.ADL/4	= f # Finale Harkonnen  -- Missing in: d2tm_adlib, d2tm_sc55, dune2_smd, dune2000.
+; dune19.ADL/2	= f # Finale Atreides   -- Missing in: d2tm_adlib, d2tm_sc55, dune2_smd, dune2000.
+; dune19.ADL/3	= f # Finale Ordos      -- Missing in: d2tm_adlib, d2tm_sc55, dune2_smd, dune2000.
+; dune0.ADL/4	= f # Logos             -- Missing in: d2tm_adlib, d2tm_sc55, dune2_smd, dune2000.
+; dune16.ADL/8	= f # Cutscene          -- Missing in: d2tm_adlib, d2tm_sc55, dune2_smd, dune2000.
+; dune20.ADL/2	= f # Credits           -- Missing in: d2tm_adlib, d2tm_sc55, dune2000.
 
 [dune2_midi]
 ; dune1.C55/6	= f # Idle 1

src/config_a5.c

@@ -135,7 +135,6 @@ static const GameOption s_game_option[] = {
 	{ "music",  "fed2k_mt32",       	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_SHAIWA_MT32].enable },
 	{ "music",  "rcblanke_sc55",    	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_RCBLANKE_SC55].enable },
 	{ "music",  "d2tm_adlib",       	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_D2TM_ADLIB].enable },
-	{ "music",  "d2tm_mt32",        	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_D2TM_MT32].enable },
 	{ "music",  "d2tm_sc55",        	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_D2TM_SC55].enable },
 	{ "music",  "dune2_pcspeaker",    	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_DUNE2_PCSPEAKER].enable },
 	{ "music",  "dune2_smd",        	CONFIG_BOOL,    .d._bool = &g_table_music_set[MUSICSET_DUNE2_SMD].enable },

src/newui/menu_extras.c

@@ -716,7 +716,6 @@ MusicOptions_Initialize(void)
 		MUSICSET_INVALID,
 		MUSICSET_INVALID,
 		MUSICSET_INVALID,
-		MUSICSET_INVALID,
 		MUSICSET_INVALID
 	};
 	enum MusicSet unavailableSets[NUM_MUSIC_SETS] = {
@@ -735,7 +734,6 @@ MusicOptions_Initialize(void)
 		MUSICSET_INVALID,
 		MUSICSET_INVALID,
 		MUSICSET_INVALID,
-		MUSICSET_INVALID,
 		MUSICSET_INVALID
 		};
 	int unavailableSetsCount = 0;

src/table/sound.c

@@ -6,7 +6,6 @@
 #include "sound.h"
 
 #define D2TM_ADLIB_PREFIX   		"d2tm_adlib"
-#define D2TM_MT32_PREFIX    		"d2tm_mt32"
 #define D2TM_SC55_PREFIX    		"d2tm_sc55"
 #define DUNE2000_PREFIX     		"dune2000"
 #define DUNE2_SMD_PREFIX    		"dune2_smd"
@@ -27,7 +26,6 @@
 #define ADD_MUSIC_FROM_SHAIWA_MT32(FILENAME)        			{ MUSIC_WANT,   MUSICSET_SHAIWA_MT32,   		NULL,   "music/" SHAIWA_MT32_PREFIX "/" FILENAME, 0, 0.65f }
 #define ADD_MUSIC_FROM_RCBLANKE_SC55(FILENAME)      			{ MUSIC_WANT,   MUSICSET_RCBLANKE_SC55, 		NULL,   "music/" RCBLANKE_SC55_PREFIX"/"FILENAME, 0, 0.80f }
 #define ADD_MUSIC_FROM_D2TM_ADLIB(FILENAME)  					{ MUSIC_WANT,   MUSICSET_D2TM_ADLIB,    		NULL,   "music/" D2TM_ADLIB_PREFIX  "/" FILENAME, 0, 0.40f }
-#define ADD_MUSIC_FROM_D2TM_MT32(FILENAME)          			{ MUSIC_WANT,   MUSICSET_D2TM_MT32,     		NULL,   "music/" D2TM_MT32_PREFIX   "/" FILENAME, 0, 0.65f }
 #define ADD_MUSIC_FROM_D2TM_SC55(FILENAME,VOLUME)   			{ MUSIC_WANT,   MUSICSET_D2TM_SC55,     		NULL,   "music/" D2TM_SC55_PREFIX   "/" FILENAME, 0, VOLUME }
 #define ADD_MUSIC_FROM_DUNE2_PCSPEAKER(FILENAME)      			{ MUSIC_WANT,   MUSICSET_DUNE2_PCSPEAKER, 		NULL,   "music/" DUNE2_PCSPEAKER_PREFIX   "/"   FILENAME, 0, 0.50f }
 #define ADD_MUSIC_FROM_DUNE2_SMD(FILENAME,SONGNAME) 			{ MUSIC_WANT,   MUSICSET_DUNE2_SMD,     		SONGNAME,"music/"DUNE2_SMD_PREFIX   "/" FILENAME, 0, 0.50f }
@@ -46,7 +44,6 @@ MusicSetInfo g_table_music_set[NUM_MUSIC_SETS] = {
 	{ true, SHAIWA_MT32_PREFIX,     	"ShaiWa MT-32" },
 	{ true, RCBLANKE_SC55_PREFIX,   	"RCBlanke SC-55" },
 	{ true, D2TM_ADLIB_PREFIX,  		"D2TM AdLib" },
-	{ true, D2TM_MT32_PREFIX,   		"D2TM MT-32" },
 	{ true, D2TM_SC55_PREFIX,   		"D2TM SC-55" },
 	{ true, DUNE2_PCSPEAKER_PREFIX,   	"PC Speaker" },
 	{ true, DUNE2_SMD_PREFIX,   		"Sega Mega Drive" },
@@ -90,7 +87,6 @@ static MusicInfo s_table_music_intro[] = {
 	ADD_MUSIC_FROM_FLUIDSYNTH   ("dune0.C55", 2),
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_00_2"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("intro"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("intro"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("intro", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER("Intro [dune0-2]"),
 
@@ -125,7 +121,6 @@ static MusicInfo s_table_music_main_menu[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  		("dune2_mt32_07_13"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55		("title"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   		("menu"),
-	ADD_MUSIC_FROM_D2TM_MT32    		("menu"),
 	ADD_MUSIC_FROM_D2TM_SC55    		("menu", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Hope Fades (Main Menu) [dune7-6]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    		("12_chosendestiny", "Chosen Destiny"),
@@ -148,7 +143,6 @@ static MusicInfo s_table_music_strategic_map[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_16_23"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("conquest_map"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("nextconq"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("nextconq"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("nextconq", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("11_evasiveaction", "Evasive Action"),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Destructive Minds (Strategic Map) [dune16-7]"),
@@ -161,7 +155,6 @@ static MusicInfo s_table_music_briefing_harkonnen[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_07_09"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("mentat_harkonnen"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("mentath"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("mentath"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("mentath", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Arid Sands (Harkonnen Briefing) [dune7-2]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("04_radnorsscheme", "Radnor's Scheme"),
@@ -174,7 +167,6 @@ static MusicInfo s_table_music_briefing_atreides[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_07_10"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("mentat_atreides"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("mentata"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("mentata"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("mentata", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("The Council (Atreides Briefing) [dune7-3]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("02_cyrilscouncil", "Cyril's Council"),
@@ -187,7 +179,6 @@ static MusicInfo s_table_music_briefing_ordos[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_07_11"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("mentat_ordos"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("mentato"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("mentato"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("mentato", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Disturbed Thoughts (Ordos Briefing) [dune7-4]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("03_ammonsadvice", "Ammon's Advice"),
@@ -200,7 +191,6 @@ static MusicInfo s_table_music_win_harkonnen[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_08_11"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("victory_harkonnen"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("win3"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("win2"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("win2", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Victory 2 (Harkonnen Victory) [dune8-3]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("15_harkonnenrules", "Harkonnen Rules"),
@@ -213,7 +203,6 @@ static MusicInfo s_table_music_win_atreides[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_08_10"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("victory_atreides"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("win1"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("win1"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("win1", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Victory (Atreides Victory) [dune8-2]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("13_conquest", "Conquest"),
@@ -226,7 +215,6 @@ static MusicInfo s_table_music_win_ordos[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_17_21"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("victory_ordos"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("win2"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("win3"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("win3", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Abuse (Ordos Victory) [dune17-4]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("14_slitherin", "Slitherin"),
@@ -239,7 +227,6 @@ static MusicInfo s_table_music_lose_harkonnen[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_01_4"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("defeat_harkonnen"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("lose2"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("lose1"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("lose1", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Harkonnen Defeat [dune1-4]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("18_harkonnendirge", "Harkonnen Dirge"),
@@ -252,7 +239,6 @@ static MusicInfo s_table_music_lose_atreides[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_01_5"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("defeat_atreides"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("lose1"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("lose2"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("lose2", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Atreides Defeat [dune1-5]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("16_atreidesdirge", "Atreides Dirge"),
@@ -265,7 +251,6 @@ static MusicInfo s_table_music_lose_ordos[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_01_6"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("defeat_ordos"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("lose3"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("lose3"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("lose3", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Ordos Defeat [dune1-3]"),
 	ADD_MUSIC_FROM_DUNE2_SMD    ("17_ordosdirge", "Ordos Dirge"),
@@ -305,7 +290,6 @@ static MusicInfo s_table_music_idle1[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_01_7"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient02"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace2"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace1"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace2", 1.0f),
 };
 
@@ -316,7 +300,6 @@ static MusicInfo s_table_music_idle2[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_02_8"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient03"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace5"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace2"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace5", 1.0f),
 };
 
@@ -327,7 +310,6 @@ static MusicInfo s_table_music_idle3[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_03_9"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient04"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace4"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace3"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace4", 1.0f),
 	ADD_MUSIC_FROM_DUNE2000     ("RISEHARK", "Rise of Harkonnen"),
 };
@@ -339,7 +321,6 @@ static MusicInfo s_table_music_idle4[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_04_10"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient05"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace1"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace4"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace1", 1.0f),
 };
 
@@ -350,7 +331,6 @@ static MusicInfo s_table_music_idle5[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_05_11"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient06"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace9"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace5"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace9", 1.0f),
 	ADD_MUSIC_FROM_DUNE2000     ("UNDERCON", "Under Construction"),
 };
@@ -362,7 +342,6 @@ static MusicInfo s_table_music_idle6[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_06_12"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient07"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace8"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace6"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace8", 1.0f),
 	ADD_MUSIC_FROM_DUNE2000     ("ATREGAIN", "The Atreides Gain"),
 };
@@ -374,7 +353,6 @@ static MusicInfo s_table_music_idle7[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_09_13"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient08"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace7"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace7"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace7", 1.0f),
 };
 
@@ -385,7 +363,6 @@ static MusicInfo s_table_music_idle8[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_09_14"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient09"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace6"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace8"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace6", 1.0f),
 };
 
@@ -396,7 +373,6 @@ static MusicInfo s_table_music_idle9[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_18_24"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("ambient10"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("peace3"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("peace9"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("peace3", 1.0f),
 };
 
@@ -499,7 +475,6 @@ static MusicInfo s_table_music_attack1[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_10_17"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack01"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack5"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack1"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack4", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Into the Heat (Attack Music 1) [dune10-7]"),
 	ADD_MUSIC_FROM_DUNE2000     ("ARAKATAK", "Attack on Arrakis"),
@@ -512,7 +487,6 @@ static MusicInfo s_table_music_attack2[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_11_18"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack02"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack3"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack2"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack5", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Epic War (Attack Music 2) [dune11-7]"),
 };
@@ -524,7 +498,6 @@ static MusicInfo s_table_music_attack3[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_12_19"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack03"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack6"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack3"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack2", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Humans Fall (Attack Music 3) [dune12-7]"),
 	ADD_MUSIC_FROM_DUNE2000     ("HARK_BAT", "Harkonnen Battle"),
@@ -537,7 +510,6 @@ static MusicInfo s_table_music_attack4[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_13_20"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack04"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack2"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack4"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack3", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Adrenaline Rush (Attack Music 4) [dune13-7]"),
 };
@@ -549,7 +521,6 @@ static MusicInfo s_table_music_attack5[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_14_21"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack05"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack4"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack5"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack1", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Only the Strongest Survives (Attack Music 5) [dune14-7]"),
 	ADD_MUSIC_FROM_DUNE2000     ("FIGHTPWR", "Fight for Power"),
@@ -562,7 +533,6 @@ static MusicInfo s_table_music_attack6[] = {
 	ADD_MUSIC_FROM_SHAIWA_MT32  ("dune2_mt32_15_22"),
 	ADD_MUSIC_FROM_RCBLANKE_SC55("attack06"),
 	ADD_MUSIC_FROM_D2TM_ADLIB   ("attack1"),
-	ADD_MUSIC_FROM_D2TM_MT32    ("attack6"),
 	ADD_MUSIC_FROM_D2TM_SC55    ("attack6", 1.0f),
 	ADD_MUSIC_FROM_DUNE2_PCSPEAKER		("Marching Towards the End (Attack Music 6) [dune15-7]"),
 };

src/table/sound.h

@@ -16,7 +16,6 @@ enum MusicSet {
 	MUSICSET_SHAIWA_MT32,   /* fed2k_mt32 */
 	MUSICSET_RCBLANKE_SC55,
 	MUSICSET_D2TM_ADLIB,
-	MUSICSET_D2TM_MT32,
 	MUSICSET_D2TM_SC55,
 	MUSICSET_DUNE2_PCSPEAKER,
 	MUSICSET_DUNE2_SMD,