Fixing branch problem.
This commit is contained in:
@@ -1382,8 +1382,8 @@ ServerLobbyThread::IsPlayerBanned(const std::string &name) const
|
|||||||
{
|
{
|
||||||
bool retVal = false;
|
bool retVal = false;
|
||||||
boost::mutex::scoped_lock lock(m_banPlayerNameListMutex);
|
boost::mutex::scoped_lock lock(m_banPlayerNameListMutex);
|
||||||
RegExList::const_iterator i = m_banPlayerNameList.begin();
|
RegexList::const_iterator i = m_banPlayerNameList.begin();
|
||||||
RegExList::const_iterator end = m_banPlayerNameList.end();
|
RegexList::const_iterator end = m_banPlayerNameList.end();
|
||||||
while (i != end)
|
while (i != end)
|
||||||
{
|
{
|
||||||
if (regex_match(name, *i))
|
if (regex_match(name, *i))
|
||||||
|
|||||||
@@ -102,6 +102,7 @@ protected:
|
|||||||
typedef std::map<unsigned, boost::shared_ptr<ServerGameThread> > GameMap;
|
typedef std::map<unsigned, boost::shared_ptr<ServerGameThread> > GameMap;
|
||||||
typedef std::map<std::string, boost::timers::portable::microsec_timer> TimerClientAddressMap;
|
typedef std::map<std::string, boost::timers::portable::microsec_timer> TimerClientAddressMap;
|
||||||
typedef std::list<unsigned> RemoveGameList;
|
typedef std::list<unsigned> RemoveGameList;
|
||||||
|
typedef std::list<boost::regex> RegexList;
|
||||||
|
|
||||||
// Main function of the thread.
|
// Main function of the thread.
|
||||||
virtual void Main();
|
virtual void Main();
|
||||||
@@ -191,7 +192,7 @@ private:
|
|||||||
SessionIdList m_resubscribeList;
|
SessionIdList m_resubscribeList;
|
||||||
mutable boost::mutex m_resubscribeListMutex;
|
mutable boost::mutex m_resubscribeListMutex;
|
||||||
|
|
||||||
RegExList m_banPlayerNameList;
|
RegexList m_banPlayerNameList;
|
||||||
mutable boost::mutex m_banPlayerNameListMutex;
|
mutable boost::mutex m_banPlayerNameListMutex;
|
||||||
|
|
||||||
GameMap m_gameMap;
|
GameMap m_gameMap;
|
||||||
|
|||||||
Reference in New Issue
Block a user