Merge branch 'master' into 303

Conflicts:
	src/game/ObjectMgr.h
This commit is contained in:
tomrus88 2008-10-27 01:27:48 +03:00
commit 233e5eac6f
32 changed files with 160 additions and 68 deletions

View file

@ -2554,3 +2554,17 @@ void World::UpdateMaxSessionCounters()
m_maxActiveSessionCount = std::max(m_maxActiveSessionCount,uint32(m_sessions.size()-m_QueuedPlayer.size()));
m_maxQueuedSessionCount = std::max(m_maxQueuedSessionCount,uint32(m_QueuedPlayer.size()));
}
void World::LoadDBVersion()
{
QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1");
if(result)
{
Field* fields = result->Fetch();
m_DBVersion = fields[0].GetString();
delete result;
}
else
m_DBVersion = "unknown world database";
}