diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-16 00:36:50 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-16 00:36:50 +0100 |
| commit | b651b352ed26e13bf85948ee45219566889c585c (patch) | |
| tree | 6b8e4273b2e3d3aed765c8e86549acfe59fd5767 /src/server/game/Conditions/DisableMgr.cpp | |
| parent | 60e608417eee5ad1822592d226c9b2e65096f98c (diff) | |
| parent | 3c42401d662104145bf55a6550b432dd8a4428e2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 6215cf5bb75..27695f3eafa 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -59,7 +59,7 @@ void LoadDisables() if (!result) { - sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded 0 disables. DB table `disables` is empty!"); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 disables. DB table `disables` is empty!"); return; } @@ -228,7 +228,7 @@ void LoadDisables() } while (result->NextRow()); - sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime)); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u disables in %u ms", total_count, GetMSTimeDiffToNow(oldMSTime)); } @@ -239,7 +239,7 @@ void CheckQuestDisables() uint32 count = m_DisableMap[DISABLE_TYPE_QUEST].size(); if (!count) { - sLog->outInfo(LOG_FILTER_GENERAL, ">> Checked 0 quest disables."); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Checked 0 quest disables."); return; } @@ -259,7 +259,7 @@ void CheckQuestDisables() ++itr; } - sLog->outInfo(LOG_FILTER_GENERAL, ">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); + sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Checked %u quest disables in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } |