mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 09:15:38 +00:00
Code Issues Releases Wiki Activity

Merge branch 'nvpp_fixes' into 'master'

Browse source 
Improve safety of NVPP ESM records

See merge request OpenMW/openmw!3307
This commit is contained in:
psi29a 2023-08-03 07:15:43 +00:00
commit 9c2a2e1946
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/esm4/loadnavi.cpp
View file

@ -257,8 +257,13 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
break;
}
total -= 10; // HACK
std::uint32_t node;
if (total >= 10)
total -= 10; // HACK
else
throw std::runtime_error("expected total amount of chunks >= 0xa");
std::uint32_t node = 0;
bool nodeFound = false;
for (std::uint32_t i = 0; i < total; ++i)
{
std::vector<FormId> preferredPaths;
@ -267,6 +272,7 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
{
reader.get(node);
reader.get(count);
nodeFound = true;
}
if (count > 0)
{
@ -274,6 +280,9 @@ void ESM4::Navigation::load(ESM4::Reader& reader)
for (FormId& value : preferredPaths)
reader.getFormId(value);
}
if (!nodeFound)
throw std::runtime_error("node not found");
mPreferredPaths.push_back(std::make_pair(node, preferredPaths));
#if 0
std::cout << "node " << std::hex << node // FIXME: debugging only