[10809] Remove diplicate World::GetQueueSize and rename functions to consistence naming

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
SeTM 2010-12-02 02:37:46 +03:00 committed by VladimirMangos
parent 7657d4faf1
commit 1fbc09e1fd
3 changed files with 37 additions and 38 deletions

View file

@ -436,8 +436,8 @@ class World
/// Get the number of current active sessions
void UpdateMaxSessionCounters();
uint32 GetActiveAndQueuedSessionCount() const { return m_sessions.size(); }
uint32 GetActiveSessionCount() const { return m_sessions.size() - m_QueuedPlayer.size(); }
uint32 GetQueuedSessionCount() const { return m_QueuedPlayer.size(); }
uint32 GetActiveSessionCount() const { return m_sessions.size() - m_QueuedSessions.size(); }
uint32 GetQueuedSessionCount() const { return m_QueuedSessions.size(); }
/// Get the maximum number of parallel sessions on the server since last reboot
uint32 GetMaxQueuedSessionCount() const { return m_maxQueuedSessionCount; }
uint32 GetMaxActiveSessionCount() const { return m_maxActiveSessionCount; }
@ -456,10 +456,9 @@ class World
//player Queue
typedef std::list<WorldSession*> Queue;
void AddQueuedPlayer(WorldSession*);
bool RemoveQueuedPlayer(WorldSession* session);
int32 GetQueuePos(WorldSession*);
uint32 GetQueueSize() const { return m_QueuedPlayer.size(); }
void AddQueuedSession(WorldSession*);
bool RemoveQueuedSession(WorldSession* session);
int32 GetQueuedSessionPos(WorldSession*);
/// \todo Actions on m_allowMovement still to be implemented
/// Is movement allowed?
@ -665,7 +664,7 @@ class World
time_t m_NextMonthlyQuestReset;
//Player Queue
Queue m_QueuedPlayer;
Queue m_QueuedSessions;
//sessions that are added async
void AddSession_(WorldSession* s);