[8793] Don't do operations through singleton if already in singleton context.

* Also, some minor things:
   - Remove duplicate sWorldLog define.
   - Add sRealmList macro for RealmList::Instance().
   - Use sLog macro in scripting log functions.
This commit is contained in:
XTZGZoReX 2009-11-08 19:32:50 +01:00
parent 146657885d
commit b3f3ffa885
11 changed files with 32 additions and 32 deletions

View file

@ -879,14 +879,14 @@ bool AuthSocket::_HandleRealmList()
delete result;
///- Update realm list if need
RealmList::Instance().UpdateIfNeed();
sRealmList.UpdateIfNeed();
///- Circle through realms in the RealmList and construct the return packet (including # of user characters in each realm)
ByteBuffer pkt;
pkt << (uint32) 0;
pkt << (uint16) RealmList::Instance().size();
pkt << (uint16) sRealmList.size();
RealmList::RealmMap::const_iterator i;
for( i = RealmList::Instance().begin(); i != RealmList::Instance().end(); ++i )
for( i = sRealmList.begin(); i != sRealmList.end(); ++i )
{
uint8 AmountOfCharacters;