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

--HG--
branch : trunk

1 files changed, 33 insertions, 33 deletions

diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 672c0cca726..15e1701cba8 100755
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -30,30 +30,30 @@ void SystemMgr::LoadVersion()
     {
         Field* pFields = Result->Fetch();
 
-        sLog.outString("TSCR: Database version is: %s", pFields[0].GetCString());
-        sLog.outString();
+        sLog->outString("TSCR: Database version is: %s", pFields[0].GetCString());
+        sLog->outString();
     }
     else
     {
-        sLog.outError("TSCR: Missing `version`.`script_version` information.");
-        sLog.outString();
+        sLog->outError("TSCR: Missing `version`.`script_version` information.");
+        sLog->outString();
     }
 }
 
 void SystemMgr::LoadScriptTexts()
 {
-    sLog.outString("TSCR: Loading Script Texts...");
+    sLog->outString("TSCR: Loading Script Texts...");
     LoadTrinityStrings("script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
     
-    sLog.outString("TSCR: Loading Script Texts additional data...");
+    sLog->outString("TSCR: Loading Script Texts additional data...");
     uint32 oldMSTime = getMSTime();
 
     QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
 
     if (!result)
     {
-        sLog.outString(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
-        sLog.outString();
+        sLog->outString(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
+        sLog->outString();
         return;
     }
 
@@ -72,49 +72,49 @@ void SystemMgr::LoadScriptTexts()
 
         if (iId >= 0)
         {
-            sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
+            sLog->outErrorDb("TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
             continue;
         }
 
         if (iId > TEXT_SOURCE_RANGE || iId <= TEXT_SOURCE_RANGE*2)
         {
-            sLog.outErrorDb("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
+            sLog->outErrorDb("TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
             continue;
         }
 
         if (pTemp.uiSoundId)
         {
             if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
         }
 
         if (!GetLanguageDescByID(pTemp.uiLanguage))
-            sLog.outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+            sLog->outErrorDb("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
         if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-            sLog.outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+            sLog->outErrorDb("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
         m_mTextDataMap[iId] = pTemp;
         ++uiCount;
     } while (result->NextRow());
 
-    sLog.outString(">> Loaded %u additional Script Texts data in %u ms", uiCount, GetMSTimeDiffToNow(oldMSTime));
-    sLog.outString();
+    sLog->outString(">> Loaded %u additional Script Texts data in %u ms", uiCount, GetMSTimeDiffToNow(oldMSTime));
+    sLog->outString();
 }
 
 void SystemMgr::LoadScriptTextsCustom()
 {
-    sLog.outString("TSCR: Loading Custom Texts...");
+    sLog->outString("TSCR: Loading Custom Texts...");
     LoadTrinityStrings("custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
 
-    sLog.outString("TSCR: Loading Custom Texts additional data...");
+    sLog->outString("TSCR: Loading Custom Texts additional data...");
 
     QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts");
 
     if (!result)
     {
-        sLog.outString(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
-        sLog.outString();
+        sLog->outString(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
+        sLog->outString();
         return;
     }
 
@@ -133,34 +133,34 @@ void SystemMgr::LoadScriptTextsCustom()
 
         if (iId >= 0)
         {
-            sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
+            sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
             continue;
         }
 
         if (iId > TEXT_SOURCE_RANGE*2 || iId <= TEXT_SOURCE_RANGE*3)
         {
-            sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
+            sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
             continue;
         }
 
         if (pTemp.uiSoundId)
         {
             if (!GetSoundEntriesStore()->LookupEntry(pTemp.uiSoundId))
-                sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
+                sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, pTemp.uiSoundId);
         }
 
         if (!GetLanguageDescByID(pTemp.uiLanguage))
-            sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
+            sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, pTemp.uiLanguage);
 
         if (pTemp.uiType > CHAT_TYPE_ZONE_YELL)
-            sLog.outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
+            sLog->outErrorDb("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, pTemp.uiType);
 
         m_mTextDataMap[iId] = pTemp;
         ++uiCount;
     } while (result->NextRow());
 
-    sLog.outString(">> Loaded %u additional Custom Texts data.", uiCount);
-    sLog.outString();
+    sLog->outString(">> Loaded %u additional Custom Texts data.", uiCount);
+    sLog->outString();
 }
 
 void SystemMgr::LoadScriptWaypoints()
@@ -177,14 +177,14 @@ void SystemMgr::LoadScriptWaypoints()
     if (result)
         uiCreatureCount = result->GetRowCount();
 
-    sLog.outString("TSCR: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);
+    sLog->outString("TSCR: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);
 
     result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 
     if (!result)
     {
-        sLog.outString(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
-        sLog.outString();
+        sLog->outString(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
+        sLog->outString();
         return;
     }
 
@@ -207,17 +207,17 @@ void SystemMgr::LoadScriptWaypoints()
 
         if (!pCInfo)
         {
-            sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
+            sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for non-existant creature entry %u", pTemp.uiCreatureEntry);
             continue;
         }
 
         if (!pCInfo->ScriptID)
-            sLog.outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
+            sLog->outErrorDb("TSCR: DB table script_waypoint has waypoint for creature entry %u, but creature does not have ScriptName defined and then useless.", pTemp.uiCreatureEntry);
 
         m_mPointMoveMap[uiEntry].push_back(pTemp);
         ++count;
     } while (result->NextRow());
 
-    sLog.outString(">> Loaded %u Script Waypoint nodes in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-    sLog.outString();
+    sLog->outString(">> Loaded %u Script Waypoint nodes in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
+    sLog->outString();
 }