From c0ba14a752e2c98e00317b2764bbe42f6bae6743 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Apr 2021 20:42:25 -0400 Subject: [PATCH] Use sounds.pk3 instead of sounds.wad --- src/d_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 57dcdefea..c806e4354 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1057,15 +1057,6 @@ static void IdentifyVersion(void) D_AddFile(startupiwads, va(pandf,srb2waddir,"patch.pk3")); #endif -#if 0 - // TODO: pk3 doesn't support music replacement IIRC - // music barely benefits from the compression anyway - // would be nice for the folders, though - D_AddFile(startupiwads, va(pandf,srb2waddir,"sounds.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"music.pk3")); - -#else - #if !defined (HAVE_SDL) || defined (HAVE_MIXER) #define MUSICTEST(str) \ @@ -1078,12 +1069,11 @@ static void IdentifyVersion(void) I_Error("File "str" has been modified with non-music/sound lumps"); \ } - MUSICTEST("sounds.wad") + MUSICTEST("sounds.pk3") MUSICTEST("music.pk3") #undef MUSICTEST -#endif #endif }