Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/tools/map_extractor/dbcfile.h
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/adtfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h

5 files changed, 21 insertions, 0 deletions

diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index 2395bdd1cff..9f8ada77317 100644
--- a/src/tools/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
@@ -40,6 +40,8 @@ enum LiquidType
 #define ADT_CELL_SIZE         8
 #define ADT_GRID_SIZE         (ADT_CELLS_PER_GRID*ADT_CELL_SIZE)
 
+#pragma pack(push, 1)
+
 //
 // Adt file height map chunk
 //
@@ -307,4 +309,6 @@ public:
     adt_MCNK* cells[ADT_CELLS_PER_GRID][ADT_CELLS_PER_GRID];
 };
 
+#pragma pack(pop)
+
 #endif
diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
index 3c71b615cc9..2bf27f5c7f6 100644
--- a/src/tools/map_extractor/dbcfile.h
+++ b/src/tools/map_extractor/dbcfile.h
@@ -86,6 +86,8 @@ class DBCFile
 
                 friend class DBCFile;
                 friend class DBCFile::Iterator;
+
+				Record& operator=(Record const& right);
         };
         /** Iterator that iterates over records
         */
@@ -118,6 +120,8 @@ class DBCFile
 
             private:
                 Record record;
+
+				Iterator& operator=(Iterator const& right);
         };
 
         // Get record by id
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 973d181f91a..2bea59e2c97 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -49,6 +49,8 @@ typedef uint8_t            uint8;
 
 #define FILE_FORMAT_VERSION    18
 
+#pragma pack(push, 1)
+
 union u_map_fcc
 {
     char   fcc_txt[4];
@@ -83,4 +85,7 @@ public:
     bool loadFile(HANDLE mpq, char *filename, bool log = true);
     virtual void free();
 };
+
+#pragma pack(pop)
+
 #endif
diff --git a/src/tools/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h
index 3184b0727a3..d897cbfd854 100644
--- a/src/tools/map_extractor/wdt.h
+++ b/src/tools/map_extractor/wdt.h
@@ -25,6 +25,8 @@
 //**************************************************************************************
 #define WDT_MAP_SIZE 64
 
+#pragma pack(push, 1)
+
 class wdt_MWMO{
     union{
         uint32 fcc;
@@ -83,4 +85,6 @@ public:
     wdt_MWMO *wmo;
 };
 
+#pragma pack(pop)
+
 #endif
\ No newline at end of file
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 220bb607315..c027c356ef5 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -67,6 +67,8 @@ struct WMOLiquidHeader
     short type;
 };
 
+#pragma pack(push, 1)
+
 struct WMOLiquidVert
 {
     uint16 unk1;
@@ -74,6 +76,8 @@ struct WMOLiquidVert
     float height;
 };
 
+#pragma pack(pop)
+
 class WMOGroup
 {
 private: