mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:40:26 +00:00
Code Issues Releases Wiki Activity

Fixes #1293: Allow interpolation type 0 in case of 0 keys

Browse source
This commit is contained in:
scrawl 2014-04-26 11:36:27 +02:00
parent b13b25dd1b
commit 45d2a00717
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwrender/npcanimation.cpp
View file

@ -68,7 +68,8 @@ namespace MWRender
float HeadAnimationTime::getValue() const float HeadAnimationTime::getValue() const
{ {
// TODO: Handle eye blinking (time is in the text keys) // TODO use time from text keys (Talk Start/Stop, Blink Start/Stop)
// TODO: Handle eye blinking
if (MWBase::Environment::get().getSoundManager()->sayDone(mReference)) if (MWBase::Environment::get().getSoundManager()->sayDone(mReference))
return 0; return 0;
else else

5
components/nif/niffile.hpp
View file

@ -199,6 +199,11 @@ struct KeyListT {
key.mContinuity = nif->getFloat(); key.mContinuity = nif->getFloat();
} }
} }
else if (mInterpolationType == 0)
{
if (count != 0)
nif->file->fail("Interpolation type 0 doesn't work with keys");
}
else else
nif->file->fail("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType)); nif->file->fail("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType));
} }