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

1 files changed, 78 insertions, 25 deletions

diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h
index 355f6b47ff2..bfa42dbe574 100755
--- a/src/server/shared/Database/Field.h
+++ b/src/server/shared/Database/Field.h
@@ -41,12 +41,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_TINY))
             {
-                sLog->outSQLDriver("Error: GetUInt8() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetUInt8() on non-tinyint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<uint8*>(data.value);
             return static_cast<uint8>(atol((char*)data.value));
@@ -58,12 +59,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_TINY))
             {
-                sLog->outSQLDriver("Error: GeInt8() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetInt8() on non-tinyint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<int8*>(data.value);
             return static_cast<int8>(atol((char*)data.value));
@@ -75,12 +77,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_SHORT) && !IsType(MYSQL_TYPE_YEAR))
             {
-                sLog->outSQLDriver("Error: GetUInt16() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetUInt16() on non-smallint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<uint16*>(data.value);
             return static_cast<uint16>(atol((char*)data.value));
@@ -92,12 +95,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_SHORT) && !IsType(MYSQL_TYPE_YEAR))
             {
-                sLog->outSQLDriver("Error: GetInt16() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetInt16() on non-smallint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<int16*>(data.value);
             return static_cast<int16>(atol((char*)data.value));
@@ -109,12 +113,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_INT24) && !IsType(MYSQL_TYPE_LONG))
             {
-                sLog->outSQLDriver("Error: GetUInt32() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetUInt32() on non-(medium)int field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<uint32*>(data.value);
             return static_cast<uint32>(atol((char*)data.value));
@@ -126,12 +131,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_INT24) && !IsType(MYSQL_TYPE_LONG))
             {
-                sLog->outSQLDriver("Error: GetInt32() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetInt32() on non-(medium)int field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<int32*>(data.value);
             return static_cast<int32>(atol((char*)data.value));
@@ -143,12 +149,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_LONGLONG) && !IsType(MYSQL_TYPE_BIT))
             {
-                sLog->outSQLDriver("Error: GetUInt64() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetUInt64() on non-bigint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<uint64*>(data.value);
             return static_cast<uint64>(atol((char*)data.value));
@@ -160,12 +167,13 @@ class Field
                 return 0;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_LONGLONG) && !IsType(MYSQL_TYPE_BIT))
             {
-                sLog->outSQLDriver("Error: GetInt64() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetInt64() on non-bigint field. Using type: %s.", FieldTypeToString(data.type));
                 return 0;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<int64*>(data.value);
             return static_cast<int64>(strtol((char*)data.value, NULL, 10));
@@ -177,12 +185,13 @@ class Field
                 return 0.0f;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_FLOAT))
             {
-                sLog->outSQLDriver("Error: GetFloat() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetFloat() on non-float field. Using type: %s.", FieldTypeToString(data.type));
                 return 0.0f;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<float*>(data.value);
             return static_cast<float>(atof((char*)data.value));
@@ -194,18 +203,19 @@ class Field
                 return 0.0f;
 
             #ifdef TRINITY_DEBUG
-            if (!IsNumeric())
+            if (!IsType(MYSQL_TYPE_DOUBLE))
             {
-                sLog->outSQLDriver("Error: GetDouble() on non-numeric field.");
+                sLog->outSQLDriver("Warning: GetDouble() on non-double field. Using type: %s.", FieldTypeToString(data.type));
                 return 0.0f;
             }
             #endif
+
             if (data.raw)
                 return *reinterpret_cast<double*>(data.value);
             return static_cast<double>(atof((char*)data.value));
         }
 
-        const char* GetCString() const
+        char const* GetCString() const
         {
             if (!data.value)
                 return NULL;
@@ -213,11 +223,12 @@ class Field
             #ifdef TRINITY_DEBUG
             if (IsNumeric())
             {
-                sLog->outSQLDriver("Error: GetCString() on numeric field.");
+                sLog->outSQLDriver("Error: GetCString() on numeric field. Using type: %s.", FieldTypeToString(data.type));
                 return NULL;
             }
             #endif
-            return static_cast<const char*>(data.value);
+            return static_cast<char const*>(data.value);
+
         }
 
         std::string GetString() const
@@ -227,7 +238,7 @@ class Field
 
             if (data.raw)
             {
-                const char* string = GetCString();
+                char const* string = GetCString();
                 if (!string)
                     string = "";
                 return std::string(string, data.length);
@@ -257,7 +268,7 @@ class Field
         #pragma pack(pop)
         #endif
 
-        void SetByteValue(const void* newValue, const size_t newSize, enum_field_types newType, uint32 length);
+        void SetByteValue(void const* newValue, size_t const newSize, enum_field_types newType, uint32 length);
         void SetStructuredValue(char* newValue, enum_field_types newType);
 
         void CleanUp()
@@ -316,6 +327,11 @@ class Field
             }
         }
 
+        bool IsType(enum_field_types type) const
+        {
+            return data.type == type;
+        }
+
         bool IsNumeric() const
         {
             return (data.type == MYSQL_TYPE_TINY ||
@@ -326,6 +342,43 @@ class Field
                     data.type == MYSQL_TYPE_DOUBLE ||
                     data.type == MYSQL_TYPE_LONGLONG );
         }
+
+    private:
+        #ifdef TRINITY_DEBUG
+        static char const* FieldTypeToString(enum_field_types type)
+        {
+            switch (type)
+            {
+                case MYSQL_TYPE_BIT:         return "BIT";
+                case MYSQL_TYPE_BLOB:        return "BLOB";
+                case MYSQL_TYPE_DATE:        return "DATE";
+                case MYSQL_TYPE_DATETIME:    return "DATETIME";
+                case MYSQL_TYPE_NEWDECIMAL:  return "NEWDECIMAL";
+                case MYSQL_TYPE_DECIMAL:     return "DECIMAL";
+                case MYSQL_TYPE_DOUBLE:      return "DOUBLE";
+                case MYSQL_TYPE_ENUM:        return "ENUM";
+                case MYSQL_TYPE_FLOAT:       return "FLOAT";
+                case MYSQL_TYPE_GEOMETRY:    return "GEOMETRY";
+                case MYSQL_TYPE_INT24:       return "INT24";
+                case MYSQL_TYPE_LONG:        return "LONG";
+                case MYSQL_TYPE_LONGLONG:    return "LONGLONG";
+                case MYSQL_TYPE_LONG_BLOB:   return "LONG_BLOB";
+                case MYSQL_TYPE_MEDIUM_BLOB: return "MEDIUM_BLOB";
+                case MYSQL_TYPE_NEWDATE:     return "NEWDATE";
+                case MYSQL_TYPE_NULL:        return "NULL";
+                case MYSQL_TYPE_SET:         return "SET";
+                case MYSQL_TYPE_SHORT:       return "SHORT";
+                case MYSQL_TYPE_STRING:      return "STRING";
+                case MYSQL_TYPE_TIME:        return "TIME";
+                case MYSQL_TYPE_TIMESTAMP:   return "TIMESTAMP";
+                case MYSQL_TYPE_TINY:        return "TINY";
+                case MYSQL_TYPE_TINY_BLOB:   return "TINY_BLOB";
+                case MYSQL_TYPE_VAR_STRING:  return "VAR_STRING";
+                case MYSQL_TYPE_YEAR:        return "YEAR";
+                default:                     return "-Unknown-";
+            }
+        }
+        #endif
 };
 
 #endif