Tools: Enabled struct packing to ensure that structures are read from files properly

4 files changed, 13 insertions, 4 deletions

diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp
index 246b448380a..c792524eec1 100644
--- a/src/tools/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
@@ -159,7 +159,7 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
                 ADT.read(buf, size);
                 char* p=buf;
                 int q = 0;
-                WmoInstansName = new string[size];
+                WmoInstansName = new std::string[size];
                 while (p<buf+size)
                 {
                     char* s = GetPlainName(p);
diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h
index aafcb46ce84..ac04074375f 100644
--- a/src/tools/vmap4_extractor/adtfile.h
+++ b/src/tools/vmap4_extractor/adtfile.h
@@ -113,14 +113,14 @@ private:
     //size_t mcnk_offsets[256], mcnk_sizes[256];
     MPQFile ADT;
     //mcell Mcell;
-    string Adtfilename;
+    std::string Adtfilename;
 public:
     ADTFile(char* filename);
     ~ADTFile();
     int nWMO;
     int nMDX;
-    string* WmoInstansName;
-    string* ModelInstansName;
+    std::string* WmoInstansName;
+    std::string* ModelInstansName;
     bool init(uint32 map_num, uint32 tileX, uint32 tileY);
     //void LoadMapChunks();
 
diff --git a/src/tools/vmap4_extractor/loadlib/loadlib.h b/src/tools/vmap4_extractor/loadlib/loadlib.h
index 1b44d13a9d3..b26d39fbbf8 100644
--- a/src/tools/vmap4_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap4_extractor/loadlib/loadlib.h
@@ -47,6 +47,8 @@ typedef uint8_t            uint8;
 
 #define FILE_FORMAT_VERSION    18
 
+#pragma pack(push, 1)
+
 //
 // File version chunk
 //
@@ -74,4 +76,7 @@ public:
     bool loadFile(char *filename, bool log = true);
     virtual void free();
 };
+
+#pragma pack(pop)
+
 #endif
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 0f1f0772bd3..a5bb7d518e8 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: