Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Grids/Notifiers/GridNotifiers.h
	src/server/game/Grids/ObjectGridLoader.h
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h

1 files changed, 6 insertions, 111 deletions

diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index f47cbc3b095..06aa6159014 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -33,13 +33,9 @@ std::string LogMessage::getTimeStr()
 }
 
 Appender::Appender(uint8 _id, std::string const& _name, AppenderType _type /* = APPENDER_NONE*/, LogLevel _level /* = LOG_LEVEL_DISABLED */, AppenderFlags _flags /* = APPENDER_FLAGS_NONE */):
-id(_id), name(_name), type(_type), level(_level), flags(_flags)
-{
-}
+id(_id), name(_name), type(_type), level(_level), flags(_flags) { }
 
-Appender::~Appender()
-{
-}
+Appender::~Appender() { }
 
 uint8 Appender::getId() const
 {
@@ -78,7 +74,7 @@ void Appender::write(LogMessage& message)
 
     message.prefix.clear();
     if (flags & APPENDER_FLAGS_PREFIX_TIMESTAMP)
-        message.prefix.append(message.getTimeStr().c_str());
+        message.prefix.append(message.getTimeStr());
 
     if (flags & APPENDER_FLAGS_PREFIX_LOGLEVEL)
     {
@@ -95,9 +91,9 @@ void Appender::write(LogMessage& message)
         if (!message.prefix.empty())
             message.prefix.push_back(' ');
 
-        char text[MAX_QUERY_LEN];
-        snprintf(text, MAX_QUERY_LEN, "[%s]", Appender::getLogFilterTypeString(message.type));
-        message.prefix.append(text);
+        message.prefix.push_back('[');
+        message.prefix.append(message.type);
+        message.prefix.push_back(']');
     }
 
     if (!message.prefix.empty())
@@ -126,104 +122,3 @@ const char* Appender::getLogLevelString(LogLevel level)
             return "DISABLED";
     }
 }
-
-char const* Appender::getLogFilterTypeString(LogFilterType type)
-{
-    switch (type)
-    {
-        case LOG_FILTER_GENERAL:
-            return "GENERAL";
-        case LOG_FILTER_UNITS:
-            return "UNITS";
-        case LOG_FILTER_PETS:
-            return "PETS";
-        case LOG_FILTER_VEHICLES:
-            return "VEHICLES";
-        case LOG_FILTER_TSCR:
-            return "TSCR";
-        case LOG_FILTER_DATABASE_AI:
-            return "DATABASE_AI";
-        case LOG_FILTER_MAPSCRIPTS:
-            return "MAPSCRIPTS";
-        case LOG_FILTER_NETWORKIO:
-            return "NETWORKIO";
-        case LOG_FILTER_SPELLS_AURAS:
-            return "SPELLS_AURAS";
-        case LOG_FILTER_ACHIEVEMENTSYS:
-            return "ACHIEVEMENTSYS";
-        case LOG_FILTER_CONDITIONSYS:
-            return "CONDITIONSYS";
-        case LOG_FILTER_POOLSYS:
-            return "POOLSYS";
-        case LOG_FILTER_AUCTIONHOUSE:
-            return "AUCTIONHOUSE";
-        case LOG_FILTER_BATTLEGROUND:
-            return "BATTLEGROUND";
-        case LOG_FILTER_OUTDOORPVP:
-            return "OUTDOORPVP";
-        case LOG_FILTER_CHATSYS:
-            return "CHATSYS";
-        case LOG_FILTER_LFG:
-            return "LFG";
-        case LOG_FILTER_MAPS:
-            return "MAPS";
-        case LOG_FILTER_PLAYER:
-            return "PLAYER";
-        case LOG_FILTER_PLAYER_LOADING:
-            return "PLAYER LOADING";
-        case LOG_FILTER_PLAYER_ITEMS:
-            return "PLAYER ITEMS";
-        case LOG_FILTER_PLAYER_SKILLS:
-            return "PLAYER SKILLS";
-        case LOG_FILTER_PLAYER_CHATLOG:
-            return "PLAYER CHATLOG";
-        case LOG_FILTER_LOOT:
-            return "LOOT";
-        case LOG_FILTER_GUILD:
-            return "GUILD";
-        case LOG_FILTER_TRANSPORTS:
-            return "TRANSPORTS";
-        case LOG_FILTER_SQL:
-            return "SQL";
-        case LOG_FILTER_GMCOMMAND:
-            return "GMCOMMAND";
-        case LOG_FILTER_REMOTECOMMAND:
-            return "REMOTECOMMAND";
-        case LOG_FILTER_WARDEN:
-            return "WARDEN";
-        case LOG_FILTER_AUTHSERVER:
-            return "AUTHSERVER";
-        case LOG_FILTER_WORLDSERVER:
-            return "WORLDSERVER";
-        case LOG_FILTER_GAMEEVENTS:
-            return "GAMEEVENTS";
-        case LOG_FILTER_CALENDAR:
-            return "CALENDAR";
-        case LOG_FILTER_CHARACTER:
-            return "CHARACTER";
-        case LOG_FILTER_ARENAS:
-            return "ARENAS";
-        case LOG_FILTER_SQL_DRIVER:
-            return "SQL DRIVER";
-        case LOG_FILTER_SQL_DEV:
-            return "SQL DEV";
-        case LOG_FILTER_PLAYER_DUMP:
-            return "PLAYER DUMP";
-        case LOG_FILTER_BATTLEFIELD:
-            return "BATTLEFIELD";
-        case LOG_FILTER_SERVER_LOADING:
-            return "SERVER LOADING";
-        case LOG_FILTER_OPCODES:
-            return "OPCODE";
-        case LOG_FILTER_SOAP:
-            return "SOAP";
-        case LOG_FILTER_RBAC:
-            return "RBAC";
-        case LOG_FILTER_CHEAT:
-            return "CHEAT";
-        default:
-            break;
-    }
-
-    return "???";
-}