Merge git://github.com/TrinityCore/TrinityCore into 4.x

Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt

2 files changed, 34 insertions, 34 deletions

diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index b583d742748..493e30d36c0 100755
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -38,11 +38,11 @@ Log::Log() :
 
 Log::~Log()
 {
-    if ( logfile != NULL )
+    if (logfile != NULL)
         fclose(logfile);
     logfile = NULL;
 
-    if ( gmLogfile != NULL )
+    if (gmLogfile != NULL)
         fclose(gmLogfile);
     gmLogfile = NULL;
 
@@ -50,7 +50,7 @@ Log::~Log()
         fclose(charLogfile);
     charLogfile = NULL;
 
-    if ( dberLogfile != NULL )
+    if (dberLogfile != NULL)
         fclose(dberLogfile);
     dberLogfile = NULL;
 
@@ -81,32 +81,32 @@ Log::~Log()
 
 void Log::SetLogLevel(char *Level)
 {
-    int32 NewLevel =atoi((char*)Level);
-    if ( NewLevel <0 )
+    int32 NewLevel = atoi((char*)Level);
+    if (NewLevel < 0)
         NewLevel = 0;
     m_logLevel = NewLevel;
 
-    outString( "LogLevel is %u", m_logLevel );
+    outString("LogLevel is %u", m_logLevel);
 }
 
 void Log::SetLogFileLevel(char *Level)
 {
-    int32 NewLevel =atoi((char*)Level);
-    if ( NewLevel <0 )
+    int32 NewLevel = atoi((char*)Level);
+    if (NewLevel < 0)
         NewLevel = 0;
     m_logFileLevel = NewLevel;
 
-    outString( "LogFileLevel is %u", m_logFileLevel );
+    outString("LogFileLevel is %u", m_logFileLevel);
 }
 
 void Log::SetDBLogLevel(char *Level)
 {
     int32 NewLevel = atoi((char*)Level);
-    if ( NewLevel < 0 )
+    if (NewLevel < 0)
         NewLevel = 0;
     m_dbLogLevel = NewLevel;
 
-    outString( "DBLogLevel is %u", m_dbLogLevel );
+    outString("DBLogLevel is %u", m_dbLogLevel);
 }
 
 void Log::Initialize()
@@ -382,7 +382,7 @@ void Log::outDB(LogTypes type, const char * str)
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_LOG);
 
     stmt->setInt32(0, realm);
-    stmt->setInt32(1, type);
+    stmt->setUInt8(1, uint8(type));
     stmt->setString(2, logStr);
 
     LoginDatabase.Execute(stmt);
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index cbaa2d80451..e32ea7765a9 100755
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -31,7 +31,7 @@ enum DebugLogFilters
     LOG_FILTER_PETS                     = 0x00000002,
     LOG_FILTER_VEHICLES                 = 0x00000004,
     LOG_FILTER_TSCR                     = 0x00000008,   // C++ AI, instance scripts, etc.
-    LOG_FILTER_DATABASE_AI              = 0x08000010,   // SmartAI, EventAI, CreatureAI
+    LOG_FILTER_DATABASE_AI              = 0x00000010,   // SmartAI, EventAI, CreatureAI
     LOG_FILTER_MAPSCRIPTS               = 0x00000020,
     LOG_FILTER_NETWORKIO                = 0x00000040,   // Anything packet/netcode related
     LOG_FILTER_SPELLS_AURAS             = 0x00000080,
@@ -118,28 +118,28 @@ class Log
         void SetColor(bool stdout_stream, ColorTypes color);
         void ResetColor(bool stdout_stream);
 
-        void outErrorST( const char * err, ... )                ATTR_PRINTF(2, 3);
-        void outDB( LogTypes type, const char * str );
-        void outString( const char * str, ... )                 ATTR_PRINTF(2, 3);
-        void outString( );
-        void outStringInLine( const char * str, ... )           ATTR_PRINTF(2, 3);
-        void outError( const char * err, ... )                  ATTR_PRINTF(2, 3);
-        void outCrash( const char * err, ... )                  ATTR_PRINTF(2, 3);
-        void outBasic( const char * str, ... )                  ATTR_PRINTF(2, 3);
-        void outDetail( const char * str, ... )                 ATTR_PRINTF(2, 3);
-        void outSQLDev( const char * str, ... )                 ATTR_PRINTF(2, 3);
+        void outErrorST(const char * err, ...)                  ATTR_PRINTF(2, 3);
+        void outDB(LogTypes type, const char * str);
+        void outString(const char * str, ...)                   ATTR_PRINTF(2, 3);
+        void outString();
+        void outStringInLine(const char * str, ...)             ATTR_PRINTF(2, 3);
+        void outError(const char * err, ...)                    ATTR_PRINTF(2, 3);
+        void outCrash(const char * err, ...)                    ATTR_PRINTF(2, 3);
+        void outBasic(const char * str, ...)                    ATTR_PRINTF(2, 3);
+        void outDetail(const char * str, ...)                   ATTR_PRINTF(2, 3);
+        void outSQLDev(const char * str, ...)                   ATTR_PRINTF(2, 3);
         void outDebug(DebugLogFilters f, const char* str, ...)  ATTR_PRINTF(3, 4);
-        void outStaticDebug( const char * str, ... )            ATTR_PRINTF(2, 3);
-        void outDebugInLine( const char * str, ... )            ATTR_PRINTF(2, 3);
-        void outErrorDb( const char * str, ... )                ATTR_PRINTF(2, 3);
-        void outChar( const char * str, ... )                   ATTR_PRINTF(2, 3);
-        void outCommand( uint32 account, const char * str, ...) ATTR_PRINTF(3, 4);
-        void outRemote( const char * str, ... )                 ATTR_PRINTF(2, 3);
-        void outChat( const char * str, ... )                   ATTR_PRINTF(2, 3);
-        void outArena( const char * str, ... )                  ATTR_PRINTF(2, 3);
-        void outSQLDriver( const char* str, ... )               ATTR_PRINTF(2, 3);
-        void outWarden( const char * str, ... )                 ATTR_PRINTF(2, 3);
-        void outCharDump( const char * str, uint32 account_id, uint32 guid, const char * name );
+        void outStaticDebug(const char * str, ...)              ATTR_PRINTF(2, 3);
+        void outDebugInLine(const char * str, ...)              ATTR_PRINTF(2, 3);
+        void outErrorDb(const char * str, ...)                  ATTR_PRINTF(2, 3);
+        void outChar(const char * str, ...)                     ATTR_PRINTF(2, 3);
+        void outCommand(uint32 account, const char * str, ...)  ATTR_PRINTF(3, 4);
+        void outRemote(const char * str, ...)                   ATTR_PRINTF(2, 3);
+        void outChat(const char * str, ...)                     ATTR_PRINTF(2, 3);
+        void outArena(const char * str, ...)                    ATTR_PRINTF(2, 3);
+        void outSQLDriver(const char* str, ...)                 ATTR_PRINTF(2, 3);
+        void outWarden(const char * str, ...)                   ATTR_PRINTF(2, 3);
+        void outCharDump(const char * str, uint32 account_id, uint32 guid, const char * name);
         void outOpCode(uint32 op, const char * name, bool smsg = true);
 
         static void outTimestamp(FILE* file);