mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'nistringpalette' into 'master'

Browse Source 
Fix NiStringPalette loading again

See merge request OpenMW/openmw!2703
This commit is contained in:
psi29a 2023-02-10 07:46:39 +00:00
commit de2bd6d802
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/nif/data.cpp
View File

@ -470,7 +470,7 @@ namespace Nif
void NiStringPalette::read(NIFStream* nif)
{
palette = nif->getString();
palette = nif->getStringPalette();
if (nif->getUInt() != palette.size())
Log(Debug::Warning) << "NIFFile Warning: Failed size check in NiStringPalette. File: "
<< nif->getFile().getFilename();

11
components/nif/nifstream.hpp
View File

@ -169,6 +169,17 @@ namespace Nif
return result;
}
/// Read a sequence of null-terminated strings
std::string getStringPalette()
{
size_t size = readLittleEndianType<uint32_t>(inp);
std::string str(size, '\0');
inp->read(str.data(), size);
if (inp->bad())
throw std::runtime_error("Failed to read string palette of " + std::to_string(size) + " chars");
return str;
}
void getChars(std::vector<char>& vec, size_t size)
{
vec.resize(size);