From 0bb5419785862e0560cb349f44dbbb6717a20d84 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 6 Jun 2018 17:11:12 +0100 Subject: [PATCH] CORRECTION OF MINOR ANNOYANCES * On request of Nev3r and Sphere (combined with my own annoyances), make SOC-loading in .pk3 files use the /SOC folder rather than the /SOCS folder. * Make the Crushstacean's claw launch sounds stop when killed. --- src/p_inter.c | 1 + src/p_setup.c | 2 +- src/w_wad.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 8f8c1f4fa..753134bf2 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2391,6 +2391,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget P_RemoveMobj(chain); chain = chainnext; } + S_StopSound(target->tracer); P_KillMobj(target->tracer, inflictor, source, damagetype); } break; diff --git a/src/p_setup.c b/src/p_setup.c index 5aedbe382..556428cbb 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3378,7 +3378,7 @@ boolean P_AddWadFile(const char *wadfilename) for (i = 0; i < numlumps; i++, lumpinfo++) { // lumpinfo = FindFolder("Lua/", &luaPos, &luaNum, lumpinfo, &numlumps, &i); -// lumpinfo = FindFolder("SOCs/", &socPos, &socNum, lumpinfo, &numlumps, &i); +// lumpinfo = FindFolder("SOC/", &socPos, &socNum, lumpinfo, &numlumps, &i); lumpinfo = FindFolder("Sounds/", &sfxPos, &sfxNum, lumpinfo, &numlumps, &i); lumpinfo = FindFolder("Music/", &musPos, &musNum, lumpinfo, &numlumps, &i); // lumpinfo = FindFolder("Sprites/", &sprPos, &sprNum, lumpinfo, &numlumps, &i); diff --git a/src/w_wad.c b/src/w_wad.c index 1b0e501a6..7babd22ef 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -194,11 +194,11 @@ static inline void W_LoadDehackedLumpsPK3(UINT16 wadnum) for (; posStart < posEnd; posStart++) LUA_LoadLump(wadnum, posStart); } - posStart = W_CheckNumForFolderStartPK3("SOCs/", wadnum, 0); + posStart = W_CheckNumForFolderStartPK3("SOC/", wadnum, 0); if (posStart != INT16_MAX) { - posEnd = W_CheckNumForFolderEndPK3("SOCs/", wadnum, posStart); - posStart++; // first "lump" will be "SOCs/" folder itself, so ignore it + posEnd = W_CheckNumForFolderEndPK3("SOC/", wadnum, posStart); + posStart++; // first "lump" will be "SOC/" folder itself, so ignore it for(; posStart < posEnd; posStart++) { lumpinfo_t *lump_p = &wadfiles[wadnum]->lumpinfo[posStart];