Cleanup of logging - removed a few duplicit functions from olden times, fixed a typo.

--HG--
branch : trunk

10 files changed, 25 insertions, 25 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 9b4ecca6579..f3f754ec296 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -96,7 +96,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                 if (pCreature->isAlive())
                 {
                     ++m_uiFelOverseerCount;
-                    debug_log("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
+                    sLog.outDebug("TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
                 }
                 break;
         }
@@ -113,7 +113,7 @@ struct instance_shadow_labyrinth : public ScriptedInstance
             case TYPE_OVERSEER:
                 if (uiData != DONE)
                 {
-                    error_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
+                    sLog.outError("TSCR: Shadow Labyrinth: TYPE_OVERSEER did not expect other data than DONE");
                     return;
                 }
                 if (m_uiFelOverseerCount)
@@ -121,11 +121,11 @@ struct instance_shadow_labyrinth : public ScriptedInstance
                     --m_uiFelOverseerCount;
 
                     if (m_uiFelOverseerCount)
-                        debug_log("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
+                        sLog.outDebug("TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
                     else
                     {
                         m_auiEncounter[1] = DONE;
-                        debug_log("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
+                        sLog.outDebug("TSCR: Shadow Labyrinth: TYPE_OVERSEER == DONE");
                     }
                 }
                 break;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 590e51d9eab..64fed0967d9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -2065,7 +2065,7 @@ void boss_illidan_stormrageAI::SummonMaiev()
     {
         EnterEvadeMode();
         me->MonsterTextEmote(EMOTE_UNABLE_TO_SUMMON, 0);
-        error_log("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
+        sLog.outError("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
     }
 }
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 663faceb672..38ce3f2590d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -276,7 +276,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI
                         GridSearcherSucceeded = true;
                     }
                 }
-            } else error_log("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
+            } else sLog.outError("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
         }
     }
 
@@ -293,13 +293,13 @@ struct boss_shade_of_akamaAI : public ScriptedAI
         if (reseting)
             return;
 
-        debug_log("TSCR: Increasing Death Count for Shade of Akama encounter");
+        sLog.outDebug("TSCR: Increasing Death Count for Shade of Akama encounter");
         ++DeathCount;
         me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
         if (guid)
         {
             if (Sorcerers.empty())
-                error_log("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
+                sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid %u from Sorcerers list but list is already empty", guid);
             else  Sorcerers.remove(guid);
         }
     }
@@ -351,17 +351,17 @@ struct boss_shade_of_akamaAI : public ScriptedAI
             {
                 CAST_AI(mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
                 Channelers.push_back((*itr)->GetGUID());
-                debug_log("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
+                sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler %u. Adding to list", (*itr)->GetGUID());
             }
         }
-        else error_log("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
+        else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
     }
 
     void SetSelectableChannelers()
     {
         if (Channelers.empty())
         {
-            error_log("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
+            sLog.outError("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
             return;
         }
 
@@ -485,7 +485,7 @@ void mob_ashtongue_channelerAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount();
-    else error_log("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
@@ -493,7 +493,7 @@ void mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
     Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
     if (Shade && Shade->isAlive())
         CAST_AI(boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID());
-    else error_log("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
+    else sLog.outError("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
 }
 
 struct npc_akamaAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 132da7d7bd1..52ccd1c6434 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -143,7 +143,7 @@ struct mob_blood_elf_council_voice_triggerAI : public ScriptedAI
             Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW);
             Council[2] = pInstance->GetData64(DATA_LADYMALANDE);
             Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR);
-        } else error_log(ERROR_INST_DATA);
+        } else sLog.outError(ERROR_INST_DATA);
     }
 
     void EnterCombat(Unit* /*who*/) {}
@@ -375,7 +375,7 @@ struct boss_illidari_councilAI : public ScriptedAI
         }
         else
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             EnterEvadeMode();
             return;
         }
@@ -423,7 +423,7 @@ struct boss_illidari_councilAI : public ScriptedAI
     {
         if (!pInstance)
         {
-            error_log(ERROR_INST_DATA);
+            sLog.outError(ERROR_INST_DATA);
             return;
         }
 
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 5af96257887..384c9b32ff8 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -124,7 +124,7 @@ struct instance_black_temple : public ScriptedInstance
             }
         }
 
-        debug_log("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
+        sLog.outDebug("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
         return NULL;
     }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 2669c8ed48d..5d60bc7f3e6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -119,7 +119,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[0] = data;
                 break;
@@ -131,7 +131,7 @@ struct instance_steam_vault : public ScriptedInstance
                     if (GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)
                         HandleGameObject(MainChambersDoor, true);
 
-                    debug_log("TSCR: Instance Steamvault: Access panel used.");
+                    sLog.outDebug("TSCR: Instance Steamvault: Access panel used.");
                 }
                 m_auiEncounter[1] = data;
                 break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 76425e351cf..500892129c2 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -51,7 +51,7 @@ struct instance_ramparts : public ScriptedInstance
 
     void SetData(uint32 uiType, uint32 uiData)
     {
-        debug_log("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
+        sLog.outDebug("TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
 
         switch(uiType)
         {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 276fe844e32..671821d8924 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -356,7 +356,7 @@ struct boss_kaelthasAI : public ScriptedAI
 
         if (!m_auiAdvisorGuid[0] || !m_auiAdvisorGuid[1] || !m_auiAdvisorGuid[2] || !m_auiAdvisorGuid[3])
         {
-            error_log("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
+            sLog.outError("TSCR: Kael'Thas One or more advisors missing, Skipping Phases 1-3");
 
             DoScriptText(SAY_PHASE4_INTRO2, me);
 
@@ -678,7 +678,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         Advisor = Unit::GetCreature((*me), m_auiAdvisorGuid[i]);
 
                         if (!Advisor)
-                            error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
+                            sLog.outError("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i);
                         else
                             CAST_AI(advisorbase_ai, Advisor->AI())->Revive(pTarget);
                     }
@@ -763,7 +763,7 @@ struct boss_kaelthasAI : public ScriptedAI
                         if (me->getThreatManager().getThreatList().size() >= 2)
                             for (uint32 i = 0; i < 3; ++i)
                         {
-                            debug_log("SD2: Kael'Thas mind control not supported.");
+                            sLog.outDebug("SD2: Kael'Thas mind control not supported.");
                             //DoCast(pUnit, SPELL_MIND_CONTROL);
                         }
 
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/hellfire_peninsula.cpp
index bafca52e463..8c3355d5238 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/hellfire_peninsula.cpp
@@ -140,7 +140,7 @@ struct npc_ancestral_wolfAI : public npc_escortAI
         if (pCreature->GetOwner() && pCreature->GetOwner()->GetTypeId() == TYPEID_PLAYER)
             Start(false, false, pCreature->GetOwner()->GetGUID());
         else
-            error_log("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
+            sLog.outError("TRINITY: npc_ancestral_wolf can not obtain owner or owner is not a player.");
 
         pCreature->SetSpeed(MOVE_WALK, 1.5f);
         Reset();
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index a44839eba90..7c5254cace6 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -463,7 +463,7 @@ struct npc_commander_dawnforgeAI : public ScriptedAI
             return true;
         }
 
-        debug_log("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
+        sLog.outDebug("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
         return false;
     }