mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 03:39:58 +00:00
Code Issues Projects 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;
} }