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

This commit is contained in:
scrawl 2012-10-01 17:57:02 +02:00
commit 61c84efa6c

View file

@ -231,10 +231,7 @@ void Land::unloadData()
bool Land::condLoad(int flags, int dataFlag, void *ptr, unsigned int size) bool Land::condLoad(int flags, int dataFlag, void *ptr, unsigned int size)
{ {
if ((mDataLoaded & dataFlag) != 0) { if ((mDataLoaded & dataFlag) == 0 && (flags & dataFlag) != 0) {
return false;
}
if (flags & dataFlag) {
mEsm->getHExact(ptr, size); mEsm->getHExact(ptr, size);
mDataLoaded |= dataFlag; mDataLoaded |= dataFlag;
return true; return true;