From 82f353be612254f8f863c842d7e703ee75747071 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Thu, 15 Nov 2018 19:17:06 -0500
Subject: [PATCH] Remove music.dta from loading

We've replaced/changed out all vanilla songs, so we no longer need it.
---
 assets/CMakeLists.txt | 2 +-
 src/d_main.c          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
index 1962685e..a24c29ea 100644
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@@ -9,7 +9,7 @@ set(SRB2_ASSET_ALL
 	${CMAKE_CURRENT_SOURCE_DIR}/chars.kart
 	${CMAKE_CURRENT_SOURCE_DIR}/maps.kart
 	${CMAKE_CURRENT_SOURCE_DIR}/sounds.kart
-	${CMAKE_CURRENT_SOURCE_DIR}/music.dta
+	#${CMAKE_CURRENT_SOURCE_DIR}/music.dta
 	${CMAKE_CURRENT_SOURCE_DIR}/music.kart
 )
 
diff --git a/src/d_main.c b/src/d_main.c
index a73f91c3..01839014 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -963,7 +963,7 @@ static void IdentifyVersion(void)
 	D_AddFile(va(pandf,srb2waddir,"patch.kart"));
 #endif
 
-	MUSICTEST("music.dta")
+	//MUSICTEST("music.dta")
 	MUSICTEST("music.kart")
 }
 
@@ -1241,7 +1241,7 @@ void D_SRB2Main(void)
 #ifdef USE_PATCH_KART
 	mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_KART);	// patch.kart
 #endif
-	mainwads++; // music.dta
+	//mainwads++; // music.dta
 	mainwads++; // music.kart
 	// don't check music.dta or kart because people like to modify it, and it doesn't matter if they do
 	// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
@@ -1257,7 +1257,7 @@ void D_SRB2Main(void)
 #ifdef USE_PATCH_KART
 	mainwads++;	// patch.kart
 #endif
-	mainwads++; // music.dta
+	//mainwads++; // music.dta
 	mainwads++; // music.kart
 #endif //ifndef DEVELOP