mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Completely remove unused sfx_MISC sounds

pull/5696/head
Gleb Mazovetskiy 3 years ago
parent
b48d4b2900
commit
55dc2315bc
3 changed files with 0 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      Source/effects.cpp
  2. 40
      Source/effects.h
  3. 1
      Source/effects_stubs.cpp

47
Source/effects.cpp
Unescape View File

@ -32,31 +32,18 @@ TSFX *sgpStreamSFX = nullptr;
/* data */
/** List of all sounds, except monsters and music */
namespace {
constexpr uint8_t Unused(uint8_t)
{
return 0;
}
} // namespace
TSFX sgSFX[] = {
// clang-format off
// _sfx_id bFlags pszName pSnd
/*PS_WALK1*/ { sfx_MISC, "sfx\\misc\\walk1.wav", nullptr },
/*PS_WALK2*/ { Unused(sfx_MISC), "sfx\\misc\\walk2.wav", nullptr },
/*PS_WALK3*/ { Unused(sfx_MISC), "sfx\\misc\\walk3.wav", nullptr },
/*PS_WALK4*/ { Unused(sfx_MISC), "sfx\\misc\\walk4.wav", nullptr },
/*PS_BFIRE*/ { sfx_MISC, "sfx\\misc\\bfire.wav", nullptr },
/*PS_FMAG*/ { Unused(sfx_MISC), "sfx\\misc\\fmag.wav", nullptr },
/*PS_TMAG*/ { sfx_MISC, "sfx\\misc\\tmag.wav", nullptr },
/*PS_LGHIT*/ { Unused(sfx_MISC), "sfx\\misc\\lghit.wav", nullptr },
/*PS_LGHIT1*/ { Unused(sfx_MISC), "sfx\\misc\\lghit1.wav", nullptr },
/*PS_SWING*/ { sfx_MISC, "sfx\\misc\\swing.wav", nullptr },
/*PS_SWING2*/ { sfx_MISC, "sfx\\misc\\swing2.wav", nullptr },
/*PS_DEAD*/ { sfx_MISC, "sfx\\misc\\dead.wav", nullptr },
/*IS_STING1*/ { sfx_MISC | sfx_HELLFIRE, "sfx\\misc\\sting1.wav", nullptr },
/*IS_FBALLBOW*/ { sfx_MISC | sfx_HELLFIRE, "sfx\\misc\\fballbow.wav", nullptr },
/*IS_QUESTDN*/ { sfx_STREAM, "sfx\\misc\\questdon.wav", nullptr },
/*IS_ARMRFKD*/ { Unused(sfx_MISC), "sfx\\items\\armrfkd.wav", nullptr },
/*IS_BARLFIRE*/ { sfx_MISC, "sfx\\items\\barlfire.wav", nullptr },
/*IS_BARREL*/ { sfx_MISC, "sfx\\items\\barrel.wav", nullptr },
/*IS_POPPOP8*/ { sfx_MISC | sfx_HELLFIRE, "sfx\\items\\podpop8.wav", nullptr },
@ -77,19 +64,15 @@ TSFX sgSFX[] = {
/*IS_FCAP*/ { sfx_MISC, "sfx\\items\\flipcap.wav", nullptr },
/*IS_FHARM*/ { sfx_MISC, "sfx\\items\\flipharm.wav", nullptr },
/*IS_FLARM*/ { sfx_MISC, "sfx\\items\\fliplarm.wav", nullptr },
/*IS_FMAG*/ { Unused(sfx_MISC), "sfx\\items\\flipmag.wav", nullptr },
/*IS_FMAG1*/ { Unused(sfx_MISC), "sfx\\items\\flipmag1.wav", nullptr },
/*IS_FMUSH*/ { sfx_MISC, "sfx\\items\\flipmush.wav", nullptr },
/*IS_FPOT*/ { sfx_MISC, "sfx\\items\\flippot.wav", nullptr },
/*IS_FRING*/ { sfx_MISC, "sfx\\items\\flipring.wav", nullptr },
/*IS_FROCK*/ { sfx_MISC, "sfx\\items\\fliprock.wav", nullptr },
/*IS_FSCRL*/ { sfx_MISC, "sfx\\items\\flipscrl.wav", nullptr },
/*IS_FSHLD*/ { sfx_MISC, "sfx\\items\\flipshld.wav", nullptr },
/*IS_FSIGN*/ { Unused(sfx_MISC), "sfx\\items\\flipsign.wav", nullptr },
/*IS_FSTAF*/ { sfx_MISC, "sfx\\items\\flipstaf.wav", nullptr },
/*IS_FSWOR*/ { sfx_MISC, "sfx\\items\\flipswor.wav", nullptr },
/*IS_GOLD*/ { sfx_MISC, "sfx\\items\\gold.wav", nullptr },
/*IS_HLMTFKD*/ { Unused(sfx_MISC), "sfx\\items\\hlmtfkd.wav", nullptr },
/*IS_IANVL*/ { sfx_MISC, "sfx\\items\\invanvl.wav", nullptr },
/*IS_IAXE*/ { sfx_MISC, "sfx\\items\\invaxe.wav", nullptr },
/*IS_IBLST*/ { sfx_MISC, "sfx\\items\\invblst.wav", nullptr },
@ -114,79 +97,50 @@ TSFX sgSFX[] = {
/*IS_MAGIC1*/ { sfx_MISC, "sfx\\items\\magic1.wav", nullptr },
/*IS_RBOOK*/ { sfx_MISC, "sfx\\items\\readbook.wav", nullptr },
/*IS_SARC*/ { sfx_MISC, "sfx\\items\\sarc.wav", nullptr },
/*IS_SHLDFKD*/ { Unused(sfx_MISC), "sfx\\items\\shielfkd.wav", nullptr },
/*IS_SWRDFKD*/ { Unused(sfx_MISC), "sfx\\items\\swrdfkd.wav", nullptr },
/*IS_TITLEMOV*/ { sfx_UI, "sfx\\items\\titlemov.wav", nullptr },
/*IS_TITLSLCT*/ { sfx_UI, "sfx\\items\\titlslct.wav", nullptr },
/*IS_TRAP*/ { sfx_MISC, "sfx\\items\\trap.wav", nullptr },
/*IS_CAST1*/ { Unused(sfx_MISC), "sfx\\misc\\cast1.wav", nullptr },
/*IS_CAST10*/ { Unused(sfx_MISC), "sfx\\misc\\cast10.wav", nullptr },
/*IS_CAST12*/ { Unused(sfx_MISC), "sfx\\misc\\cast12.wav", nullptr },
/*IS_CAST2*/ { sfx_MISC, "sfx\\misc\\cast2.wav", nullptr },
/*IS_CAST3*/ { Unused(sfx_MISC), "sfx\\misc\\cast3.wav", nullptr },
/*IS_CAST4*/ { sfx_MISC, "sfx\\misc\\cast4.wav", nullptr },
/*IS_CAST5*/ { Unused(sfx_MISC), "sfx\\misc\\cast5.wav", nullptr },
/*IS_CAST6*/ { sfx_MISC, "sfx\\misc\\cast6.wav", nullptr },
/*IS_CAST7*/ { sfx_MISC, "sfx\\misc\\cast7.wav", nullptr },
/*IS_CAST8*/ { sfx_MISC, "sfx\\misc\\cast8.wav", nullptr },
/*IS_CAST9*/ { Unused(sfx_MISC), "sfx\\misc\\cast9.wav", nullptr },
/*LS_HEALING*/ { Unused(sfx_MISC), "sfx\\misc\\healing.wav", nullptr },
/*IS_REPAIR*/ { sfx_MISC, "sfx\\misc\\repair.wav", nullptr },
/*LS_ACID*/ { sfx_MISC, "sfx\\misc\\acids1.wav", nullptr },
/*LS_ACIDS*/ { Unused(sfx_MISC), "sfx\\misc\\acids2.wav", nullptr },
/*LS_APOC*/ { sfx_MISC, "sfx\\misc\\apoc.wav", nullptr },
/*LS_ARROWALL*/ { Unused(sfx_MISC), "sfx\\misc\\arrowall.wav", nullptr },
/*LS_BLODBOIL*/ { Unused(sfx_MISC), "sfx\\misc\\bldboil.wav", nullptr },
/*LS_BLODSTAR*/ { sfx_MISC, "sfx\\misc\\blodstar.wav", nullptr },
/*LS_BLSIMPT*/ { sfx_MISC, "sfx\\misc\\blsimpt.wav", nullptr },
/*LS_BONESP*/ { sfx_MISC, "sfx\\misc\\bonesp.wav", nullptr },
/*LS_BSIMPCT*/ { sfx_MISC, "sfx\\misc\\bsimpct.wav", nullptr },
/*LS_CALDRON*/ { sfx_MISC, "sfx\\misc\\caldron.wav", nullptr },
/*LS_CBOLT*/ { sfx_MISC, "sfx\\misc\\cbolt.wav", nullptr },
/*LS_CHLTNING*/ { Unused(sfx_MISC), "sfx\\misc\\chltning.wav", nullptr },
/*LS_DSERP*/ { sfx_MISC, "sfx\\misc\\dserp.wav", nullptr },
/*LS_ELECIMP1*/ { sfx_MISC, "sfx\\misc\\elecimp1.wav", nullptr },
/*LS_ELEMENTL*/ { sfx_MISC, "sfx\\misc\\elementl.wav", nullptr },
/*LS_ETHEREAL*/ { sfx_MISC, "sfx\\misc\\ethereal.wav", nullptr },
/*LS_FBALL*/ { Unused(sfx_MISC), "sfx\\misc\\fball.wav", nullptr },
/*LS_FBOLT1*/ { sfx_MISC, "sfx\\misc\\fbolt1.wav", nullptr },
/*LS_FBOLT2*/ { Unused(sfx_MISC), "sfx\\misc\\fbolt2.wav", nullptr },
/*LS_FIRIMP1*/ { Unused(sfx_MISC), "sfx\\misc\\firimp1.wav", nullptr },
/*LS_FIRIMP2*/ { sfx_MISC, "sfx\\misc\\firimp2.wav", nullptr },
/*LS_FLAMWAVE*/ { sfx_MISC, "sfx\\misc\\flamwave.wav", nullptr },
/*LS_FLASH*/ { Unused(sfx_MISC), "sfx\\misc\\flash.wav", nullptr },
/*LS_FOUNTAIN*/ { sfx_MISC, "sfx\\misc\\fountain.wav", nullptr },
/*LS_GOLUM*/ { sfx_MISC, "sfx\\misc\\golum.wav", nullptr },
/*LS_GOLUMDED*/ { Unused(sfx_MISC), "sfx\\misc\\golumded.wav", nullptr },
/*LS_GSHRINE*/ { sfx_MISC, "sfx\\misc\\gshrine.wav", nullptr },
/*LS_GUARD*/ { sfx_MISC, "sfx\\misc\\guard.wav", nullptr },
/*LS_GUARDLAN*/ { sfx_MISC, "sfx\\misc\\grdlanch.wav", nullptr },
/*LS_HOLYBOLT*/ { sfx_MISC, "sfx\\misc\\holybolt.wav", nullptr },
/*LS_HYPER*/ { Unused(sfx_MISC), "sfx\\misc\\hyper.wav", nullptr },
/*LS_INFRAVIS*/ { sfx_MISC, "sfx\\misc\\infravis.wav", nullptr },
/*LS_INVISIBL*/ { sfx_MISC, "sfx\\misc\\invisibl.wav", nullptr },
/*LS_INVPOT*/ { Unused(sfx_MISC), "sfx\\misc\\invpot.wav", nullptr },
/*LS_LNING1*/ { sfx_MISC, "sfx\\misc\\lning1.wav", nullptr },
/*LS_LTNING*/ { Unused(sfx_MISC), "sfx\\misc\\ltning.wav", nullptr },
/*LS_MSHIELD*/ { sfx_MISC, "sfx\\misc\\mshield.wav", nullptr },
/*LS_NESTXPLD*/ { sfx_MISC | sfx_HELLFIRE, "sfx\\misc\\nestxpld.wav", nullptr },
/*LS_NOVA*/ { sfx_MISC, "sfx\\misc\\nova.wav", nullptr },
/*LS_PORTAL*/ { Unused(sfx_MISC), "sfx\\misc\\portal.wav", nullptr },
/*LS_PUDDLE*/ { sfx_MISC, "sfx\\misc\\puddle.wav", nullptr },
/*LS_RESUR*/ { sfx_MISC, "sfx\\misc\\resur.wav", nullptr },
/*LS_SCURSE*/ { Unused(sfx_MISC), "sfx\\misc\\scurse.wav", nullptr },
/*LS_SCURIMP*/ { sfx_MISC, "sfx\\misc\\scurimp.wav", nullptr },
/*LS_SENTINEL*/ { sfx_MISC, "sfx\\misc\\sentinel.wav", nullptr },
/*LS_SHATTER*/ { Unused(sfx_MISC), "sfx\\misc\\shatter.wav", nullptr },
/*LS_SOULFIRE*/ { Unused(sfx_MISC), "sfx\\misc\\soulfire.wav", nullptr },
/*LS_SPOUTLOP*/ { Unused(sfx_MISC), "sfx\\misc\\spoutlop.wav", nullptr },
/*LS_SPOUTSTR*/ { sfx_MISC, "sfx\\misc\\spoutstr.wav", nullptr },
/*LS_STORM*/ { Unused(sfx_MISC), "sfx\\misc\\storm.wav", nullptr },
/*LS_TRAPDIS*/ { sfx_MISC, "sfx\\misc\\trapdis.wav", nullptr },
/*LS_TELEPORT*/ { sfx_MISC, "sfx\\misc\\teleport.wav", nullptr },
/*LS_VTHEFT*/ { Unused(sfx_MISC), "sfx\\misc\\vtheft.wav", nullptr },
/*LS_WALLLOOP*/ { sfx_MISC, "sfx\\misc\\wallloop.wav", nullptr },
/*LS_WALLSTRT*/ { Unused(sfx_MISC), "sfx\\misc\\wallstrt.wav", nullptr },
/*LS_LMAG*/ { sfx_MISC | sfx_HELLFIRE, "sfx\\misc\\lmag.wav", nullptr },
/*TSFX_BMAID1*/ { sfx_STREAM, "sfx\\towners\\bmaid01.wav", nullptr },
/*TSFX_BMAID2*/ { sfx_STREAM, "sfx\\towners\\bmaid02.wav", nullptr },
@ -1077,7 +1031,6 @@ _sfx_id RndSFX(_sfx_id psfx)
case PS_MONK69:
case PS_SWING:
case LS_ACID:
case IS_FMAG:
case IS_MAGIC:
case IS_BHIT:
nRand = 2;

40
Source/effects.h
Unescape View File

@ -123,21 +123,14 @@ enum class HeroSpeech : uint8_t {
enum _sfx_id : int16_t {
PS_WALK1,
PS_WALK2,
PS_WALK3,
PS_WALK4,
PS_BFIRE,
PS_FMAG,
PS_TMAG,
PS_LGHIT,
PS_LGHIT1,
PS_SWING,
PS_SWING2,
PS_DEAD,
IS_STING1,
IS_FBALLBOW,
IS_QUESTDN,
IS_ARMRFKD,
IS_BARLFIRE,
IS_BARREL,
IS_POPPOP8,
@ -158,19 +151,15 @@ enum _sfx_id : int16_t {
IS_FCAP,
IS_FHARM,
IS_FLARM,
IS_FMAG,
IS_FMAG1,
IS_FMUSH,
IS_FPOT,
IS_FRING,
IS_FROCK,
IS_FSCRL,
IS_FSHLD,
IS_FSIGN,
IS_FSTAF,
IS_FSWOR,
IS_GOLD,
IS_HLMTFKD,
IS_IANVL,
IS_IAXE,
IS_IBLST,
@ -195,79 +184,50 @@ enum _sfx_id : int16_t {
IS_MAGIC1,
IS_RBOOK,
IS_SARC,
IS_SHLDFKD,
IS_SWRDFKD,
IS_TITLEMOV,
IS_TITLSLCT,
IS_TRAP,
IS_CAST1,
IS_CAST10,
IS_CAST12,
IS_CAST2,
IS_CAST3,
IS_CAST4,
IS_CAST5,
IS_CAST6,
IS_CAST7,
IS_CAST8,
IS_CAST9,
LS_HEALING,
IS_REPAIR,
LS_ACID,
LS_ACIDS,
LS_APOC,
LS_ARROWALL,
LS_BLODBOIL,
LS_BLODSTAR,
LS_BLSIMPT,
LS_BONESP,
LS_BSIMPCT,
LS_CALDRON,
LS_CBOLT,
LS_CHLTNING,
LS_DSERP,
LS_ELECIMP1,
LS_ELEMENTL,
LS_ETHEREAL,
LS_FBALL,
LS_FBOLT1,
LS_FBOLT2,
LS_FIRIMP1,
LS_FIRIMP2,
LS_FLAMWAVE,
LS_FLASH,
LS_FOUNTAIN,
LS_GOLUM,
LS_GOLUMDED,
LS_GSHRINE,
LS_GUARD,
LS_GUARDLAN,
LS_HOLYBOLT,
LS_HYPER,
LS_INFRAVIS,
LS_INVISIBL,
LS_INVPOT,
LS_LNING1,
LS_LTNING,
LS_MSHIELD,
LS_NESTXPLD,
LS_NOVA,
LS_PORTAL,
LS_PUDDLE,
LS_RESUR,
LS_SCURSE,
LS_SCURIMP,
LS_SENTINEL,
LS_SHATTER,
LS_SOULFIRE,
LS_SPOUTLOP,
LS_SPOUTSTR,
LS_STORM,
LS_TRAPDIS,
LS_TELEPORT,
LS_VTHEFT,
LS_WALLLOOP,
LS_WALLSTRT,
LS_LMAG,
TSFX_BMAID1,
TSFX_BMAID2,

1
Source/effects_stubs.cpp
Unescape View File

@ -21,7 +21,6 @@ void PlaySFX(_sfx_id psfx)
case PS_MONK69:
case PS_SWING:
case LS_ACID:
case IS_FMAG:
case IS_MAGIC:
case IS_BHIT:
case PS_WARR14:

Write Preview
Loading…
Cancel
Save