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

container iterator fix

Browse source
This commit is contained in:
Marc Zinnschlag 2012-05-18 22:24:19 +02:00
parent 52e5e14654
commit 498530fad7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/containerstore.cpp
View file

@ -228,6 +228,11 @@ MWWorld::ContainerStoreIterator::ContainerStoreIterator (int mask, ContainerStor
: mType (0), mMask (mask), mContainer (container) : mType (0), mMask (mask), mContainer (container)
{ {
nextType(); nextType();
if (mType==-1 || (**this).getRefData().getCount())
return;
++*this;
} }
void MWWorld::ContainerStoreIterator::incType() void MWWorld::ContainerStoreIterator::incType()
@ -249,7 +254,7 @@ void MWWorld::ContainerStoreIterator::nextType()
{ {
incType(); incType();
if (mType & mMask) if ((mType & mMask) && mType>0)
if (resetIterator()) if (resetIterator())
break; break;
} }