Merge branch 'master' of https://github.com/OpenMW/openmw into osg

This commit is contained in:
scrawl 2015-06-23 05:12:12 +02:00
commit 5ac502d104

View file

@ -32,6 +32,7 @@ void ESM::NpcStats::load (ESMReader &esm)
for (int i=0; i<27; ++i)
mSkills[i].load (esm);
mWerewolfDeprecatedData = false;
if (esm.peekNextSub("STBA"))
{
// we have deprecated werewolf skills, stored interleaved