INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 23:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mark scriptstrings as used even when referencing them via zone pointer

Browse Source
This commit is contained in:
Jan
2022-12-03 12:44:33 +01:00
parent bb613e4fcf
commit 61a42afe28
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ZoneLoading/Loading/AssetLoader.cpp
View File

@ -50,12 +50,24 @@ void AssetLoader::LoadScriptStringArray(const bool atStreamStart, const size_t c
}
}
void AssetLoader::MarkScriptStringArrayAsUsed(const scr_string_t* scrStringArray, const size_t count)
{
for (size_t index = 0; index < count; index++)
{
const auto scrString = scrStringArray[index];
if (scrString >= m_zone->m_script_strings.Count())
continue;
m_used_script_strings.emplace(scrString);
}
}
XAssetInfoGeneric* AssetLoader::LinkAsset(std::string name, void* asset)
{
std::vector<scr_string_t> usedScriptStrings;
if(!m_used_script_strings.empty())
if (!m_used_script_strings.empty())
{
for(auto scrString : m_used_script_strings)
for (auto scrString : m_used_script_strings)
{
usedScriptStrings.push_back(scrString);
}

1
src/ZoneLoading/Loading/AssetLoader.h
View File

@ -23,6 +23,7 @@ protected:
scr_string_t UseScriptString(scr_string_t scrString);
void LoadScriptStringArray(bool atStreamStart, size_t count);
void MarkScriptStringArrayAsUsed(const scr_string_t* scrStringArray, size_t count);
XAssetInfoGeneric* LinkAsset(std::string name, void* asset);