mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stringpalette' into 'master'

Browse Source 
Fix NiStringPalette loading

See merge request OpenMW/openmw!406
This commit is contained in:
psi29a 2020-11-13 23:04:16 +00:00
commit 18a95377eb
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/nif/data.cpp
View File

@ -460,21 +460,9 @@ void NiPalette::read(NIFStream *nif)
void NiStringPalette::read(NIFStream *nif) void NiStringPalette::read(NIFStream *nif)
{ {
unsigned int size = nif->getUInt(); palette = nif->getString();
if (!size) if (nif->getUInt() != palette.size())
return;
std::vector<char> source;
nif->getChars(source, size);
if (nif->getUInt() != size)
nif->file->warn("Failed size check in NiStringPalette"); nif->file->warn("Failed size check in NiStringPalette");
if (source[source.size()-1] != '\0')
source.emplace_back('\0');
const char* buffer = source.data();
while (static_cast<size_t>(buffer - source.data()) < source.size())
{
palette.emplace_back(buffer);
buffer += palette.back().size() + 1;
}
} }
void NiBoolData::read(NIFStream *nif) void NiBoolData::read(NIFStream *nif)

2
components/nif/data.hpp
View File

@ -262,7 +262,7 @@ public:
struct NiStringPalette : public Record struct NiStringPalette : public Record
{ {
std::vector<std::string> palette; std::string palette;
void read(NIFStream *nif) override; void read(NIFStream *nif) override;
}; };