zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-11 15:05:04 +00:00
Code Issues Packages Projects Wiki Activity

Revert FileSource rename

Browse Source
This commit is contained in:
Jbleezy 2024-10-07 12:33:01 -07:00
parent bd57f84ecd
commit 351a4441c2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,7 @@ namespace
{ {
// clang-format off // clang-format off
return headerRow.RequireIndexForHeader("Name", m_name) return headerRow.RequireIndexForHeader("Name", m_name)
&& headerRow.RequireIndexForHeader("File", m_file_source) && headerRow.RequireIndexForHeader("FileSource", m_file_source)
&& headerRow.RequireIndexForHeader("Secondary", m_secondary) && headerRow.RequireIndexForHeader("Secondary", m_secondary)
&& headerRow.RequireIndexForHeader("Storage", m_storage) && headerRow.RequireIndexForHeader("Storage", m_storage)
&& headerRow.RequireIndexForHeader("Bus", m_bus) && headerRow.RequireIndexForHeader("Bus", m_bus)

4
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp
View File

@ -24,7 +24,7 @@ namespace
{ {
const std::string ALIAS_HEADERS[]{ const std::string ALIAS_HEADERS[]{
"Name", "Name",
"File", "FileSource",
"Secondary", "Secondary",
"Storage", "Storage",
"Bus", "Bus",
@ -473,7 +473,7 @@ namespace
// Name // Name
WriteColumnString(stream, alias.name); WriteColumnString(stream, alias.name);
// File // FileSource
const auto* extension = maybeFormat ? ExtensionForSndFormat(*maybeFormat) : ""; const auto* extension = maybeFormat ? ExtensionForSndFormat(*maybeFormat) : "";
WriteColumnString(stream, alias.assetFileName ? std::format("{}{}", alias.assetFileName, extension) : ""); WriteColumnString(stream, alias.assetFileName ? std::format("{}{}", alias.assetFileName, extension) : "");