forked from teamnwah/openmw-tes3coop
Merge branch 'master' of https://github.com/zinnschlag/openmw into spellcreation
This commit is contained in:
commit
61c84efa6c
1 changed files with 2 additions and 5 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue