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

more linux build errors

Browse Source
This commit is contained in:
Alex 2024-01-26 12:58:31 -05:00
parent 4e8d335c26
commit 365502d819
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,26 +1,25 @@
#include "AssetLoaderSoundBank.h" #include "AssetLoaderSoundBank.h"
#include "Csv/ParsedCsv.h" #include "Csv/ParsedCsv.h"
#include "ObjContainer/SoundBank/SoundBankWriter.h"
#include "nlohmann/json.hpp"
#include "Game/T6/CommonT6.h" #include "Game/T6/CommonT6.h"
#include "Game/T6/ObjConstantsT6.h" #include "Game/T6/ObjConstantsT6.h"
#include "Game/T6/T6.h" #include "Game/T6/T6.h"
#include "ObjContainer/SoundBank/SoundBankWriter.h"
#include "Pool/GlobalAssetPool.h" #include "Pool/GlobalAssetPool.h"
#include "nlohmann/json.hpp"
#include <Utils/StringUtils.h> #include <Utils/StringUtils.h>
#include <cstring>
#include <iostream>
#include <fstream>
#include <climits> #include <climits>
#include <cstring>
#include <fstream>
#include <iostream>
using namespace T6; using namespace T6;
namespace fs = std::filesystem; namespace fs = std::filesystem;
namespace namespace
{ {
const std::string PREFIXES_TO_DROP[] { const std::string PREFIXES_TO_DROP[]{
"raw/", "raw/",
"devraw/", "devraw/",
}; };
@ -60,7 +59,7 @@ namespace
return nullptr; return nullptr;
} }
} } // namespace
void* AssetLoaderSoundBank::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) void* AssetLoaderSoundBank::CreateEmptyAsset(const std::string& assetName, MemoryManager* memory)
{ {
@ -355,13 +354,13 @@ bool LoadSoundRadverbs(MemoryManager* memory, SndBank* sndBank, const SearchPath
for (auto i = 0u; i < sndBank->radverbCount; i++) for (auto i = 0u; i < sndBank->radverbCount; i++)
{ {
auto& row = radverbCsv[i]; auto row = radverbCsv[i];
auto& name = row.GetValue("name", true); auto& name = row.GetValue("name", true);
if (name.empty()) if (name.empty())
return false; return false;
strncpy_s(sndBank->radverbs[i].name, name.data(), 32); strncpy(sndBank->radverbs[i].name, name.data(), 32);
sndBank->radverbs[i].id = Common::SND_HashName(name.data()); sndBank->radverbs[i].id = Common::SND_HashName(name.data());
sndBank->radverbs[i].smoothing = row.GetValueFloat("smoothing"); sndBank->radverbs[i].smoothing = row.GetValueFloat("smoothing");
sndBank->radverbs[i].earlyTime = row.GetValueFloat("earlyTime"); sndBank->radverbs[i].earlyTime = row.GetValueFloat("earlyTime");
@ -398,8 +397,7 @@ bool LoadSoundDuckList(ISearchPath* searchPath, MemoryManager* memory, SndBank*
for (auto i = 0u; i < sndBank->duckCount; i++) for (auto i = 0u; i < sndBank->duckCount; i++)
{ {
auto* duck = &sndBank->ducks[i]; auto row = duckListCsv[i];
auto& row = duckListCsv[i];
const auto name = row.GetValue("name", true); const auto name = row.GetValue("name", true);
if (name.empty()) if (name.empty())
@ -412,7 +410,8 @@ bool LoadSoundDuckList(ISearchPath* searchPath, MemoryManager* memory, SndBank*
return false; return false;
} }
strncpy_s(duck->name, name.data(), 32); auto* duck = &sndBank->ducks[i];
strncpy(duck->name, name.data(), 32);
duck->id = Common::SND_HashName(name.data()); duck->id = Common::SND_HashName(name.data());
auto duckJson = nlohmann::json::parse(*duckFile.m_stream); auto duckJson = nlohmann::json::parse(*duckFile.m_stream);