diff --git a/Source/effects.cpp b/Source/effects.cpp index 1683947b4..1df897a09 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -147,6 +147,8 @@ void LoadEffectsData() reader.readString("path", item.pszName); } sgSFX.shrink_to_fit(); + // We're not actually parsing the IDs yet, thus this sanity check here. + assert(static_cast(SfxID::LAST) + 1 == sgSFX.size()); } void PrivSoundInit(uint8_t bLoadMask) diff --git a/Source/effects.h b/Source/effects.h index 0addb5b4a..3ff45e876 100644 --- a/Source/effects.h +++ b/Source/effects.h @@ -137,8 +137,6 @@ enum class SfxID : int16_t { PodPop, UrnExpload, UrnBreak, - BrutalHit, // Unused - BrutalHit1, // Unused ChestOpen, DoorClose, DoorOpen, @@ -214,7 +212,6 @@ enum class SfxID : int16_t { SpellGolem, OperateGoatShrine, SpellGuardian, - SpellGuardianHit, // Unused SpellHolyBolt, SpellInfravision, SpellInvisibility, // Unused @@ -281,7 +278,6 @@ enum class SfxID : int16_t { Griswold8, Griswold9, Griswold10, - Griswold11, Griswold12, Griswold13, Griswold14, @@ -324,13 +320,11 @@ enum class SfxID : int16_t { Griswold51, Griswold52, Griswold53, - Griswold54, Griswold55, Griswold56, Cow1, Cow2, Pig, - Duck, // Unused WoundedTownsmanOld, // Unused Farnham1, Farnham2, @@ -497,7 +491,6 @@ enum class SfxID : int16_t { Cain29, Cain30, Cain31, - Cain32, Cain33, Cain34, Cain35, @@ -546,7 +539,6 @@ enum class SfxID : int16_t { Ogden39, Ogden40, Ogden41, - Ogden42, Ogden43, Ogden44, Ogden45, @@ -909,11 +901,6 @@ enum class SfxID : int16_t { Warrior93, Warrior94, Warrior95, - Warrior95b, - Warrior95c, - Warrior95d, - Warrior95e, - Warrior95f, Warrior96b, Warrior97, Warrior98, @@ -981,18 +968,15 @@ enum class SfxID : int16_t { Gharbad2, Gharbad3, Gharbad4, - Izual, // Unused Lachdanan1, Lachdanan2, Lachdanan3, LazarusGreeting, - LazarusGreetingShort, // Unused LeoricGreeting, Snotspill1, Snotspill2, Snotspill3, Warlord, - Warlock, // Unused Zhar1, Zhar2, DiabloDeath, diff --git a/Source/effects_stubs.cpp b/Source/effects_stubs.cpp index 29fd40110..12b588af4 100644 --- a/Source/effects_stubs.cpp +++ b/Source/effects_stubs.cpp @@ -19,7 +19,6 @@ void PlaySFX(SfxID psfx) case SfxID::Swing: case SfxID::SpellAcid: case SfxID::OperateShrine: - case SfxID::BrutalHit: case SfxID::Warrior14: case SfxID::Warrior15: case SfxID::Warrior16: diff --git a/assets/txtdata/sound/effects-unused.tsv b/assets/txtdata/sound/effects-unused.tsv index 478e612db..d3cd401f6 100644 --- a/assets/txtdata/sound/effects-unused.tsv +++ b/assets/txtdata/sound/effects-unused.tsv @@ -1,4 +1,5 @@ id flags path +BrutalHit Misc sfx\items\bhit.wav BrutalHit1 Misc sfx\items\bhit1.wav SpellGuardianHit Misc sfx\misc\grdlanch.wav Griswold11 Stream sfx\towners\bsmith11.wav diff --git a/assets/txtdata/sound/effects.tsv b/assets/txtdata/sound/effects.tsv index 1f85d54c5..68ab2a333 100644 --- a/assets/txtdata/sound/effects.tsv +++ b/assets/txtdata/sound/effects.tsv @@ -14,7 +14,6 @@ PodExpload Misc,Hellfire sfx\items\podpop8.wav PodPop Misc,Hellfire sfx\items\podpop5.wav UrnExpload Misc,Hellfire sfx\items\urnpop3.wav UrnBreak Misc,Hellfire sfx\items\urnpop2.wav -BrutalHit Misc sfx\items\bhit.wav ChestOpen Misc sfx\items\chest.wav DoorClose Misc sfx\items\doorclos.wav DoorOpen Misc sfx\items\dooropen.wav