mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.

Browse Source
This commit is contained in:
scrawl 2014-01-25 15:10:25 +01:00
parent f09328ca84
commit 9c0ed69550
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esm/cellref.cpp
View File

@ -18,6 +18,11 @@ void ESM::CellRef::load (ESMReader& esm, bool wideRefNum)
mRefID = esm.getHNString ("NAME");
// Again, UNAM sometimes appears after NAME and sometimes later.
// Or perhaps this UNAM means something different?
mReferenceBlocked = -1;
esm.getHNOT (mReferenceBlocked, "UNAM");
mScale = 1.0;
esm.getHNOT (mScale, "XSCL");
@ -54,7 +59,6 @@ void ESM::CellRef::load (ESMReader& esm, bool wideRefNum)
mKey = esm.getHNOString ("KNAM");
mTrap = esm.getHNOString ("TNAM");
mReferenceBlocked = -1;
mFltv = 0;
esm.getHNOT (mReferenceBlocked, "UNAM");
esm.getHNOT (mFltv, "FLTV");
@ -162,4 +166,4 @@ void ESM::CellRef::blank()
bool ESM::operator== (const CellRef::RefNum& left, const CellRef::RefNum& right)
{
return left.mIndex==right.mIndex && left.mContentFile==right.mContentFile;
}
}