zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: little improvement on sound bank types

Browse Source
This commit is contained in:
Jan 2024-10-06 10:51:04 +02:00
parent ff98b53625
commit bc51ecb49d
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Common/Game/T6/T6_Assets.h
View File

@ -6230,7 +6230,7 @@ namespace T6
unsigned int isBig : 1; // 4 unsigned int isBig : 1; // 4
unsigned int pauseable : 1; // 5 unsigned int pauseable : 1; // 5
unsigned int isMusic : 1; // 6 unsigned int isMusic : 1; // 6
unsigned int stopOnDeath : 1; // 7 unsigned int stopOnEntDeath : 1; // 7
unsigned int timescale : 1; // 8 unsigned int timescale : 1; // 8
unsigned int voiceLimit : 1; // 9 unsigned int voiceLimit : 1; // 9
unsigned int ignoreMaxDist : 1; // 10 unsigned int ignoreMaxDist : 1; // 10
@ -6249,7 +6249,9 @@ namespace T6
unsigned int reverbFalloffCurve : 6; // 8-13 unsigned int reverbFalloffCurve : 6; // 8-13
unsigned int volumeMinFalloffCurve : 6; // 14-19 unsigned int volumeMinFalloffCurve : 6; // 14-19
unsigned int reverbMinFalloffCurve : 6; // 20-25 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 struct SndAlias
@ -6257,7 +6259,7 @@ namespace T6
const char* name; const char* name;
unsigned int id; unsigned int id;
const char* subtitle; const char* subtitle;
const char* secondaryname; const char* secondaryName;
unsigned int assetId; unsigned int assetId;
const char* assetFileName; const char* assetFileName;
SndAliasFlags flags; SndAliasFlags flags;

4
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp
View File

@ -171,7 +171,7 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow&
const auto secondaryName = row.GetValue("secondary"); const auto secondaryName = row.GetValue("secondary");
if (!secondaryName.empty()) if (!secondaryName.empty())
alias->secondaryname = memory->Dup(secondaryName.data()); alias->secondaryName = memory->Dup(secondaryName.data());
const auto subtitle = row.GetValue("subtitle"); const auto subtitle = row.GetValue("subtitle");
if (!subtitle.empty()) if (!subtitle.empty())
@ -231,7 +231,7 @@ bool LoadSoundAlias(MemoryManager* memory, SndAlias* alias, const ParsedCsvRow&
alias->flags.timescale = row.GetValue("timescale") == "yes"; alias->flags.timescale = row.GetValue("timescale") == "yes";
alias->flags.isMusic = row.GetValue("music") == "yes"; alias->flags.isMusic = row.GetValue("music") == "yes";
alias->flags.pauseable = row.GetValue("pause") == "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 = alias->duckGroup =
static_cast<decltype(alias->duckGroup)>(GetValueIndex(row.GetValue("duck_group"), SOUND_DUCK_GROUPS, std::extent_v<decltype(SOUND_DUCK_GROUPS)>)); static_cast<decltype(alias->duckGroup)>(GetValueIndex(row.GetValue("duck_group"), SOUND_DUCK_GROUPS, std::extent_v<decltype(SOUND_DUCK_GROUPS)>));

2
src/ZoneCode/Game/T6/XAssets/SndBank.txt
View File

@ -21,7 +21,7 @@ set count head count;
use SndAlias; use SndAlias;
set string name; set string name;
set string subtitle; set string subtitle;
set string secondaryname; set string secondaryName;
set string assetFileName; set string assetFileName;
// SndDuck // SndDuck