krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation

Browse source
This commit is contained in:
scrawl 2012-10-01 17:57:02 +02:00
commit 61c84efa6c
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/esm/loadland.cpp
View file

@ -169,7 +169,7 @@ void Land::loadData(int flags)
mEsm->restoreContext(mContext);
memset(mLandData->mNormals, 0, LAND_NUM_VERTS * 3);
if (mEsm->isNextSub("VNML")) {
condLoad(actual, DATA_VNML, mLandData->mNormals, sizeof(VNML));
}
@ -231,10 +231,7 @@ void Land::unloadData()
bool Land::condLoad(int flags, int dataFlag, void *ptr, unsigned int size)
{
if ((mDataLoaded & dataFlag) != 0) {
return false;
}
if (flags & dataFlag) {
if ((mDataLoaded & dataFlag) == 0 && (flags & dataFlag) != 0) {
mEsm->getHExact(ptr, size);
mDataLoaded |= dataFlag;
return true;