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

Fix not supporting nullptr scriptstrings

Browse Source
This commit is contained in:
Jan
2021-12-30 16:51:16 +01:00
parent 7283cc5640
commit 538c4be839
20 changed files with 209 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
View File

@ -56,9 +56,9 @@
using namespace T6;
ContentLoader::ContentLoader()
: varXAsset(nullptr),
varScriptStringList(nullptr)
{
varXAsset = nullptr;
varScriptStringList = nullptr;
}
void ContentLoader::LoadScriptStringList(const bool atStreamStart)
@ -78,17 +78,8 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
varXString = varScriptStringList->strings;
LoadXStringArray(true, varScriptStringList->count);
for (int i = 0; i < varScriptStringList->count; i++)
{
if (varScriptStringList->strings[i])
{
m_zone->m_script_strings.AddScriptString(varScriptStringList->strings[i]);
}
else
{
m_zone->m_script_strings.AddScriptString("");
}
}
if (varScriptStringList->strings && varScriptStringList->count > 0)
m_zone->m_script_strings.InitializeForExistingZone(varScriptStringList->strings, static_cast<size_t>(varScriptStringList->count));
}
m_stream->PopBlock();
@ -96,7 +87,7 @@ void ContentLoader::LoadScriptStringList(const bool atStreamStart)
assert(m_zone->m_script_strings.Count() <= SCR_STRING_MAX + 1);
}
void ContentLoader::LoadXAsset(const bool atStreamStart)
void ContentLoader::LoadXAsset(const bool atStreamStart) const
{
#define LOAD_ASSET(type_index, typeName, headerEntry) \
case type_index: \