1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-31 06:32:39 +00:00
This commit is contained in:
trav5 2024-04-27 21:38:20 +02:00
parent 897e43ae1e
commit 52e1f32c88

View File

@ -53,20 +53,22 @@ namespace
FilteredDialogueIterator& operator++() FilteredDialogueIterator& operator++()
{ {
if (mIter == mEndIter)
{
return *this;
}
do do
{ {
++mIter; ++mIter;
} while (mIter->mType != filter && mIter != mEndIter); } while (mIter != mEndIter && mIter->mType != filter);
return *this; return *this;
} }
FilteredDialogueIterator operator++(int) FilteredDialogueIterator operator++(int)
{ {
FilteredDialogueIterator iter = *this; FilteredDialogueIterator iter = *this;
do ++(*this);
{
++mIter;
} while (mIter->mType != filter && mIter != mEndIter);
return iter; return iter;
} }
@ -74,12 +76,9 @@ namespace
{ {
while (advance > 0 && mIter != mEndIter) while (advance > 0 && mIter != mEndIter)
{ {
++mIter; ++(*this);
if (mIter->mType == filter)
{
--advance; --advance;
} }
}
return *this; return *this;
} }