mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-14 19:36:45 +00:00
Code Issues Releases Wiki Activity

Don't load keys for Gamebryo morphs

Browse source
This commit is contained in:
Alexei Kotov 2022-09-16 05:55:37 +03:00
parent 4d01489011
commit e2ed313389
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/nif/nifkey.hpp
View file

@ -57,6 +57,14 @@ struct KeyMapT {
if (morph && nif->getVersion() >= NIFStream::generateVersion(10,1,0,106)) if (morph && nif->getVersion() >= NIFStream::generateVersion(10,1,0,106))
nif->getString(); // Frame name nif->getString(); // Frame name
if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
{
if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) &&
nif->getVersion() <= NIFStream::generateVersion(20,1,0,2) && nif->getBethVersion() < 10)
nif->getFloat(); // Legacy weight
return;
}
size_t count = nif->getUInt(); size_t count = nif->getUInt();
if (count != 0 || morph) if (count != 0 || morph)
@ -103,13 +111,6 @@ struct KeyMapT {
{ {
nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType)); nif->file->fail("Unhandled interpolation type: " + std::to_string(mInterpolationType));
} }
if (morph && nif->getVersion() > NIFStream::generateVersion(10,1,0,0))
{
if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,104) &&
nif->getVersion() <= NIFStream::generateVersion(20,1,0,2) && nif->getBethVersion() < 10)
nif->getFloat(); // Legacy weight
}
} }
private: private: