* Some singleton renames for consistency:

accmgr -> AccountMgr
objmgr -> ObjectMgr
auctionmgr -> sAuctionMgr
spellmgr -> sSpellMgr
CreatureEAI_Mgr -> sEventAIMgr
achievementmgr -> sAchievementMgr
gameeventmgr -> sGameEventMgr
sInstanceSaveManager -> sInstanceSaveMgr
poolhandler -> sPoolMgr

--HG--
branch : trunk

1 files changed, 29 insertions, 29 deletions

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 1b12db95c68..d13fed7eebc 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -84,7 +84,7 @@ Group::~Group()
 
 bool Group::Create(const uint64 &guid, const char * name)
 {
-    uint32 lowguid = objmgr.GenerateLowGuid(HIGHGUID_GROUP);
+    uint32 lowguid = sObjectMgr.GenerateLowGuid(HIGHGUID_GROUP);
     m_guid = MAKE_NEW_GUID(lowguid, 0, HIGHGUID_GROUP);
     m_leaderGuid = guid;
     m_leaderName = name;
@@ -102,7 +102,7 @@ bool Group::Create(const uint64 &guid, const char * name)
     m_raidDifficulty = RAID_DIFFICULTY_10MAN_NORMAL;
     if (!isBGGroup())
     {
-        Player *leader = objmgr.GetPlayer(guid);
+        Player *leader = sObjectMgr.GetPlayer(guid);
         if (leader)
         {
             m_dungeonDifficulty = leader->GetDungeonDifficulty();
@@ -142,7 +142,7 @@ bool Group::LoadGroupFromDB(const uint32 &groupGuid, QueryResult_AutoPtr result,
     m_leaderGuid = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER);
 
     // group leader not exist
-    if (!objmgr.GetPlayerNameByGUID(fields[0].GetUInt32(), m_leaderName))
+    if (!sObjectMgr.GetPlayerNameByGUID(fields[0].GetUInt32(), m_leaderName))
         return false;
 
     m_lootMethod = LootMethod(fields[1].GetUInt8());
@@ -191,7 +191,7 @@ bool Group::LoadMemberFromDB(uint32 guidLow, uint8 memberFlags, uint8 subgroup)
     member.guid = MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER);
 
     // skip non-existed member
-    if (!objmgr.GetPlayerNameByGUID(member.guid, member.name))
+    if (!sObjectMgr.GetPlayerNameByGUID(member.guid, member.name))
     {
         CharacterDatabase.PQuery("DELETE FROM group_member WHERE memberGuid=%u", guidLow);
         return false;
@@ -219,7 +219,7 @@ void Group::ConvertToRaid()
 
     // update quest related GO states (quest activity dependent from raid membership)
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
-        if (Player* player = objmgr.GetPlayer(citr->guid))
+        if (Player* player = sObjectMgr.GetPlayer(citr->guid))
             player->UpdateForQuestWorldObjects();
 }
 
@@ -294,7 +294,7 @@ bool Group::AddMember(const uint64 &guid, const char* name)
         return false;
     SendUpdate();
 
-    Player *player = objmgr.GetPlayer(guid);
+    Player *player = sObjectMgr.GetPlayer(guid);
     if (player)
     {
         if (!IsLeader(player->GetGUID()) && !isBGGroup())
@@ -344,7 +344,7 @@ uint32 Group::RemoveMember(const uint64 &guid, const uint8 &method)
     {
         bool leaderChanged = _removeMember(guid);
 
-        if (Player *player = objmgr.GetPlayer(guid))
+        if (Player *player = sObjectMgr.GetPlayer(guid))
         {
             // quest related GO state dependent from raid membership
             if (isRaidGroup())
@@ -413,7 +413,7 @@ void Group::Disband(bool hideDestroy)
 
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-        player = objmgr.GetPlayer(citr->guid);
+        player = sObjectMgr.GetPlayer(citr->guid);
         if (!player)
             continue;
 
@@ -502,7 +502,7 @@ void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll &r)
 
     for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = objmgr.GetPlayer(itr->first);
+        Player *p = sObjectMgr.GetPlayer(itr->first);
         if (!p || !p->GetSession())
             continue;
 
@@ -526,7 +526,7 @@ void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uin
 
     for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = objmgr.GetPlayer(itr->first);
+        Player *p = sObjectMgr.GetPlayer(itr->first);
         if (!p || !p->GetSession())
             continue;
 
@@ -549,7 +549,7 @@ void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid,
 
     for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = objmgr.GetPlayer(itr->first);
+        Player *p = sObjectMgr.GetPlayer(itr->first);
         if (!p || !p->GetSession())
             continue;
 
@@ -569,7 +569,7 @@ void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r)
 
     for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
     {
-        Player *p = objmgr.GetPlayer(itr->first);
+        Player *p = sObjectMgr.GetPlayer(itr->first);
         if (!p || !p->GetSession())
             continue;
 
@@ -606,7 +606,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject)
         if (i->freeforall)
             continue;
 
-        item = objmgr.GetItemPrototype(i->itemid);
+        item = sObjectMgr.GetItemPrototype(i->itemid);
         if (!item)
         {
             //sLog.outDebug("Group::GroupLoot: missing item prototype for item with id: %d", i->itemid);
@@ -616,7 +616,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject)
         //roll for over-threshold item if it's one-player loot
         if (item->Quality >= uint32(m_lootThreshold))
         {
-            uint64 newitemGUID = MAKE_NEW_GUID(objmgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
+            uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
             Roll* r = new Roll(newitemGUID,*i);
 
             //a vector is filled with only near party members
@@ -659,7 +659,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject)
                 {
                     for (Roll::PlayerVote::const_iterator itr=r->playerVote.begin(); itr != r->playerVote.end(); ++itr)
                     {
-                        Player *p = objmgr.GetPlayer(itr->first);
+                        Player *p = sObjectMgr.GetPlayer(itr->first);
                         if (!p || !p->GetSession())
                             continue;
 
@@ -702,12 +702,12 @@ void Group::NeedBeforeGreed(Loot *loot, WorldObject* pLootedObject)
         if (i->freeforall)
             continue;
 
-        item = objmgr.GetItemPrototype(i->itemid);
+        item = sObjectMgr.GetItemPrototype(i->itemid);
 
         //roll for over-threshold item if it's one-player loot
         if (item->Quality >= uint32(m_lootThreshold))
         {
-            uint64 newitemGUID = MAKE_NEW_GUID(objmgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
+            uint64 newitemGUID = MAKE_NEW_GUID(sObjectMgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
             Roll* r=new Roll(newitemGUID,*i);
 
             for (GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
@@ -753,7 +753,7 @@ void Group::NeedBeforeGreed(Loot *loot, WorldObject* pLootedObject)
                 {
                     for (Roll::PlayerVote::const_iterator itr=r->playerVote.begin(); itr != r->playerVote.end(); ++itr)
                     {
-                        Player *p = objmgr.GetPlayer(itr->first);
+                        Player *p = sObjectMgr.GetPlayer(itr->first);
                         if (!p || !p->GetSession())
                             continue;
 
@@ -906,7 +906,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
                 }
             }
             SendLootRollWon(0, maxguid, maxresul, ROLL_NEED, *roll);
-            player = objmgr.GetPlayer(maxguid);
+            player = sObjectMgr.GetPlayer(maxguid);
 
             if (player && player->GetSession())
             {
@@ -955,7 +955,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
                 }
             }
             SendLootRollWon(0, maxguid, maxresul, rollvote, *roll);
-            player = objmgr.GetPlayer(maxguid);
+            player = sObjectMgr.GetPlayer(maxguid);
 
             if (player && player->GetSession())
             {
@@ -1073,7 +1073,7 @@ void Group::SendUpdate()
     Player *player;
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-        player = objmgr.GetPlayer(citr->guid);
+        player = sObjectMgr.GetPlayer(citr->guid);
         if (!player || !player->GetSession() || player->GetGroup() != this)
             continue;
 
@@ -1094,7 +1094,7 @@ void Group::SendUpdate()
         {
             if (citr->guid == citr2->guid)
                 continue;
-            Player* member = objmgr.GetPlayer(citr2->guid);
+            Player* member = sObjectMgr.GetPlayer(citr2->guid);
 
             uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE;
             onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0);
@@ -1165,7 +1165,7 @@ void Group::OfflineReadyCheck()
 {
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-        Player *pl = objmgr.GetPlayer(citr->guid);
+        Player *pl = sObjectMgr.GetPlayer(citr->guid);
         if (!pl || !pl->GetSession())
         {
             WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9);
@@ -1207,7 +1207,7 @@ bool Group::_addMember(const uint64 &guid, const char* name, uint8 group)
     if (!guid)
         return false;
 
-    Player *player = objmgr.GetPlayer(guid);
+    Player *player = sObjectMgr.GetPlayer(guid);
 
     MemberSlot member;
     member.guid      = guid;
@@ -1253,7 +1253,7 @@ bool Group::_addMember(const uint64 &guid, const char* name, uint8 group)
 
 bool Group::_removeMember(const uint64 &guid)
 {
-    Player *player = objmgr.GetPlayer(guid);
+    Player *player = sObjectMgr.GetPlayer(guid);
     if (player)
     {
         //if we are removing player from battleground raid
@@ -1315,7 +1315,7 @@ void Group::_setLeader(const uint64 &guid)
             ")", GUID_LOPART(m_guid), GUID_LOPART(slot->guid)
         );
 
-        Player *player = objmgr.GetPlayer(slot->guid);
+        Player *player = sObjectMgr.GetPlayer(slot->guid);
         if (player)
         {
             for (uint8 i = 0; i < MAX_DIFFICULTY; ++i)
@@ -1437,7 +1437,7 @@ void Group::ChangeMembersGroup(const uint64 &guid, const uint8 &group)
     if (!isRaidGroup())
         return;
 
-    Player *player = objmgr.GetPlayer(guid);
+    Player *player = sObjectMgr.GetPlayer(guid);
 
     if (!player)
     {
@@ -1835,7 +1835,7 @@ void Group::BroadcastGroupUpdate(void)
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
 
-        Player *pp = objmgr.GetPlayer(citr->guid);
+        Player *pp = sObjectMgr.GetPlayer(citr->guid);
         if (pp && pp->IsInWorld())
         {
             pp->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
@@ -1851,7 +1851,7 @@ void Group::ResetMaxEnchantingLevel()
     Player *pMember = NULL;
     for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-        if (pMember = objmgr.GetPlayer(citr->guid))
+        if (pMember = sObjectMgr.GetPlayer(citr->guid))
             if (m_maxEnchantingLevel < pMember->GetSkillValue(SKILL_ENCHANTING))
                 m_maxEnchantingLevel = pMember->GetSkillValue(SKILL_ENCHANTING);
     }