From c0ba14a752e2c98e00317b2764bbe42f6bae6743 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Apr 2021 20:42:25 -0400 Subject: [PATCH 1/4] 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 } From 9ba424a6c40fd4b33cf8ea8edc8af74307425846 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Apr 2021 20:49:43 -0400 Subject: [PATCH 2/4] Mean Bean Machine sound effects --- src/sounds.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/src/sounds.c b/src/sounds.c index fa0229aa2..f090a33a6 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -837,6 +837,78 @@ sfxinfo_t S_sfx[NUMSFX] = {"kc6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"kc6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + // Mean Bean Machine sounds + {"mbs41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs54", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs55", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs56", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs57", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs58", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs59", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs5f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs60", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs61", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs64", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs6a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs6b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs6d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs6e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbs72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv84", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv85", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv86", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv87", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv88", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv89", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv8f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv90", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv91", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + {"mbv97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, + // SRB2kart {"slip", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Spinout {"screec", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Tight turning screech From 340c948c71e0febf1ee8ad16cb31020cc2c99d23 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Apr 2021 20:49:52 -0400 Subject: [PATCH 3/4] Fix being able to download our data files --- src/d_netfil.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/d_netfil.c b/src/d_netfil.c index d3058681b..5714c39cd 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1299,16 +1299,18 @@ void PT_FileFragment(void) filename = va("%s", file->filename); nameonly(filename); - if (!(strcmp(filename, "main.kart") - && strcmp(filename, "gfx.pk3") - && strcmp(filename, "textures.pk3") - && strcmp(filename, "chars.pk3") - && strcmp(filename, "maps.wad") - && strcmp(filename, "patch.pk3") - && strcmp(filename, "sounds.wad") - && strcmp(filename, "music.wad") - )) + if (!strcmp(filename, "main.kart") + || !strcmp(filename, "gfx.pk3") + || !strcmp(filename, "textures.pk3") + || !strcmp(filename, "chars.pk3") + || !strcmp(filename, "maps.pk3") + || !strcmp(filename, "patch.pk3") + || !strcmp(filename, "sounds.pk3") + || !strcmp(filename, "music.pk3") + ) + { I_Error("Tried to download \"%s\"", filename); + } filename = file->filename; From 078ffa8914ee2c4a96149b28e780c33e45fc9f7c Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 25 Apr 2021 21:31:09 -0400 Subject: [PATCH 4/4] Accidentally included one non-existent sound --- src/sounds.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sounds.c b/src/sounds.c index f090a33a6..636b53a8c 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -884,7 +884,6 @@ sfxinfo_t S_sfx[NUMSFX] = {"mbs70", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"mbs71", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"mbs72", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, - {"mbv80", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"mbv81", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"mbv82", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, {"mbv83", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},