diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index d6bb368e..89394044 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -6230,7 +6230,7 @@ namespace T6 unsigned int isBig : 1; // 4 unsigned int pauseable : 1; // 5 unsigned int isMusic : 1; // 6 - unsigned int stopOnDeath : 1; // 7 + unsigned int stopOnEntDeath : 1; // 7 unsigned int timescale : 1; // 8 unsigned int voiceLimit : 1; // 9 unsigned int ignoreMaxDist : 1; // 10 @@ -6249,7 +6249,9 @@ namespace T6 unsigned int reverbFalloffCurve : 6; // 8-13 unsigned int volumeMinFalloffCurve : 6; // 14-19 unsigned int reverbMinFalloffCurve : 6; // 20-25 - unsigned int unknown1_1 : 6; // 26-31 + unsigned int unknown1_1 : 1; // 26 + unsigned int isCinematic : 1; // 27 + unsigned int unknown1_2 : 4; // 28-31 }; struct SndAlias @@ -6257,7 +6259,7 @@ namespace T6 const char* name; unsigned int id; const char* subtitle; - const char* secondaryname; + const char* secondaryName; unsigned int assetId; const char* assetFileName; SndAliasFlags flags; diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index 32afda9e..ccffc7e2 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -171,7 +171,7 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& const auto secondaryName = row.GetValue("secondary"); if (!secondaryName.empty()) - alias->secondaryname = memory->Dup(secondaryName.data()); + alias->secondaryName = memory->Dup(secondaryName.data()); const auto subtitle = row.GetValue("subtitle"); if (!subtitle.empty()) @@ -231,7 +231,7 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow& alias->flags.timescale = row.GetValue("timescale") == "yes"; alias->flags.isMusic = row.GetValue("music") == "yes"; alias->flags.pauseable = row.GetValue("pause") == "yes"; - alias->flags.stopOnDeath = row.GetValue("stop_on_death") == "yes"; + alias->flags.stopOnEntDeath = row.GetValue("stop_on_death") == "yes"; alias->duckGroup = static_castduckGroup)>(GetValueIndex(row.GetValue("duck_group"), SOUND_DUCK_GROUPS, std::extent_v)); diff --git a/src/ZoneCode/Game/T6/XAssets/SndBank.txt b/src/ZoneCode/Game/T6/XAssets/SndBank.txt index 3911a392..79da365c 100644 --- a/src/ZoneCode/Game/T6/XAssets/SndBank.txt +++ b/src/ZoneCode/Game/T6/XAssets/SndBank.txt @@ -21,7 +21,7 @@ set count head count; use SndAlias; set string name; set string subtitle; -set string secondaryname; +set string secondaryName; set string assetFileName; // SndDuck