Merge branch 'master' into Playerbot

src/server/shared/DataStores/DBCDatabaseLoader.cpp

@@ -38,7 +38,7 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
     std::string query = Acore::StringFormat("SELECT * FROM `%s` ORDER BY `ID` DESC", _sqlTableName);
 
     // no error if empty set
-    QueryResult result = WorldDatabase.Query(query.c_str());
+    QueryResult result = WorldDatabase.Query(query);
     if (!result)
         return nullptr;
 

src/server/shared/DataStores/DBCEnums.h

@@ -21,20 +21,12 @@
 #include "Define.h"
 
 #pragma pack(push, 1)
-
-struct DBCPosition2D
-{
-    float X;
-    float Y;
-};
-
 struct DBCPosition3D
 {
     float X;
     float Y;
     float Z;
 };
-
 #pragma pack(pop)
 
 // Client expected level limitation, like as used in DBC item max levels for "until max player level"