fixed an issue with fastlink iterators not working right
--HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40778
This commit is contained in:
parent
e3b3d89bc8
commit
abb434f63a
@ -189,10 +189,8 @@ void ValveMenuStyle::ProcessWatchList()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
FastLink<int>::iterator iter;
|
|
||||||
|
|
||||||
unsigned int total = 0;
|
unsigned int total = 0;
|
||||||
for (iter=m_WatchList.begin(); iter!=m_WatchList.end(); ++iter)
|
for (FastLink<int>::iterator iter=m_WatchList.begin(); iter!=m_WatchList.end(); ++iter)
|
||||||
{
|
{
|
||||||
do_lookup[total++] = (*iter);
|
do_lookup[total++] = (*iter);
|
||||||
}
|
}
|
||||||
@ -211,7 +209,7 @@ void ValveMenuStyle::ProcessWatchList()
|
|||||||
}
|
}
|
||||||
if (curTime > player->menuStartTime + player->menuHoldTime)
|
if (curTime > player->menuStartTime + player->menuHoldTime)
|
||||||
{
|
{
|
||||||
_CancelMenu(i, false);
|
_CancelMenu(client, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,11 +93,11 @@ public:
|
|||||||
public:
|
public:
|
||||||
bool operator ==(const iterator &where) const
|
bool operator ==(const iterator &where) const
|
||||||
{
|
{
|
||||||
return (link == link && position == position);
|
return (link == where.link && position == where.position);
|
||||||
}
|
}
|
||||||
bool operator !=(const iterator &where) const
|
bool operator !=(const iterator &where) const
|
||||||
{
|
{
|
||||||
return (link != link || position != position);
|
return (link != where.link || position != where.position);
|
||||||
}
|
}
|
||||||
T & operator *()
|
T & operator *()
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user