Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)

--HG--
branch : trunk

1 files changed, 22 insertions, 22 deletions

diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index 77b8ad85050..4f085f84c2b 100755
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@@ -49,8 +49,8 @@ void DisableMgr::LoadDisables()
 
     if (!result)
     {
-        sLog.outString(">> Loaded 0 disables. DB table `disables` is empty!");
-        sLog.outString();
+        sLog->outString(">> Loaded 0 disables. DB table `disables` is empty!");
+        sLog->outString();
         return;
     }
 
@@ -62,7 +62,7 @@ void DisableMgr::LoadDisables()
         DisableType type = DisableType(fields[0].GetUInt32());
         if (type >= MAX_DISABLE_TYPES)
         {
-            sLog.outErrorDb("Invalid type %u specified in `disables` table, skipped.", type);
+            sLog->outErrorDb("Invalid type %u specified in `disables` table, skipped.", type);
             continue;
         }
 
@@ -80,13 +80,13 @@ void DisableMgr::LoadDisables()
             {
                 if (!(sSpellStore.LookupEntry(entry) || flags & SPELL_DISABLE_DEPRECATED_SPELL))
                 {
-                    sLog.outErrorDb("Spell entry %u from `disables` doesn't exist in dbc, skipped.", entry);
+                    sLog->outErrorDb("Spell entry %u from `disables` doesn't exist in dbc, skipped.", entry);
                     continue;
                 }
 
                 if (!flags || flags > MAX_SPELL_DISABLE_TYPE)
                 {
-                    sLog.outErrorDb("Disable flags for spell %u are invalid, skipped.", entry);
+                    sLog->outErrorDb("Disable flags for spell %u are invalid, skipped.", entry);
                     continue;
                 }
 
@@ -113,7 +113,7 @@ void DisableMgr::LoadDisables()
                 MapEntry const* mapEntry = sMapStore.LookupEntry(entry);
                 if (!mapEntry)
                 {
-                    sLog.outErrorDb("Map entry %u from `disables` doesn't exist in dbc, skipped.", entry);
+                    sLog->outErrorDb("Map entry %u from `disables` doesn't exist in dbc, skipped.", entry);
                     continue;
                 }
                 bool isFlagInvalid = false;
@@ -134,12 +134,12 @@ void DisableMgr::LoadDisables()
                         break;
                     case MAP_BATTLEGROUND:
                     case MAP_ARENA:
-                        sLog.outErrorDb("Battleground map %u specified to be disabled in map case, skipped.", entry);
+                        sLog->outErrorDb("Battleground map %u specified to be disabled in map case, skipped.", entry);
                         continue;
                 }
                 if (isFlagInvalid)
                 {
-                    sLog.outErrorDb("Disable flags for map %u are invalid, skipped.", entry);
+                    sLog->outErrorDb("Disable flags for map %u are invalid, skipped.", entry);
                     continue;
                 }
                 break;
@@ -147,29 +147,29 @@ void DisableMgr::LoadDisables()
             case DISABLE_TYPE_BATTLEGROUND:
                 if (!sBattlemasterListStore.LookupEntry(entry))
                 {
-                    sLog.outErrorDb("Battleground entry %u from `disables` doesn't exist in dbc, skipped.", entry);
+                    sLog->outErrorDb("Battleground entry %u from `disables` doesn't exist in dbc, skipped.", entry);
                     continue;
                 }
                 if (flags)
-                    sLog.outErrorDb("Disable flags specified for battleground %u, useless data.", entry);
+                    sLog->outErrorDb("Disable flags specified for battleground %u, useless data.", entry);
                 break;
             case DISABLE_TYPE_OUTDOORPVP:
                 if (entry > MAX_OUTDOORPVP_TYPES)
                 {
-                    sLog.outErrorDb("OutdoorPvPTypes value %u from `disables` is invalid, skipped.", entry);
+                    sLog->outErrorDb("OutdoorPvPTypes value %u from `disables` is invalid, skipped.", entry);
                     continue;
                 }
                 if (flags)
-                    sLog.outErrorDb("Disable flags specified for outdoor PvP %u, useless data.", entry);
+                    sLog->outErrorDb("Disable flags specified for outdoor PvP %u, useless data.", entry);
                 break;
             case DISABLE_TYPE_ACHIEVEMENT_CRITERIA:
                 if (!sAchievementCriteriaStore.LookupEntry(entry))
                 {
-                    sLog.outErrorDb("Achievement Criteria entry %u from `disables` doesn't exist in dbc, skipped.", entry);
+                    sLog->outErrorDb("Achievement Criteria entry %u from `disables` doesn't exist in dbc, skipped.", entry);
                     continue;
                 }
                 if (flags)
-                    sLog.outErrorDb("Disable flags specified for Achievement Criteria %u, useless data.", entry);
+                    sLog->outErrorDb("Disable flags specified for Achievement Criteria %u, useless data.", entry);
                 break;
         }
 
@@ -178,8 +178,8 @@ void DisableMgr::LoadDisables()
    }
     while (result->NextRow());
 
-    sLog.outString(">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime));
-    sLog.outString();
+    sLog->outString(">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime));
+    sLog->outString();
 }
 
 void DisableMgr::CheckQuestDisables()
@@ -189,8 +189,8 @@ void DisableMgr::CheckQuestDisables()
     uint32 count = m_DisableMap[DISABLE_TYPE_QUEST].size();
     if (!count)
     {
-        sLog.outString(">> Checked 0 quest disables.");
-        sLog.outString();
+        sLog->outString(">> Checked 0 quest disables.");
+        sLog->outString();
         return;
     }
 
@@ -200,17 +200,17 @@ void DisableMgr::CheckQuestDisables()
         const uint32 entry = itr->first;
         if (!sObjectMgr->GetQuestTemplate(entry))
         {
-            sLog.outErrorDb("Quest entry %u from `disables` doesn't exist, skipped.", entry);
+            sLog->outErrorDb("Quest entry %u from `disables` doesn't exist, skipped.", entry);
             m_DisableMap[DISABLE_TYPE_QUEST].erase(itr++);
             continue;
         }
         if (itr->second.flags)
-            sLog.outErrorDb("Disable flags specified for quest %u, useless data.", entry);
+            sLog->outErrorDb("Disable flags specified for quest %u, useless data.", entry);
         ++itr;
     }
 
-    sLog.outString(">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-    sLog.outString();
+    sLog->outString(">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
+    sLog->outString();
 }
 
 bool DisableMgr::IsDisabledFor(DisableType type, uint32 entry, Unit const* pUnit)