aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-09-07 19:36:33 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-09-07 19:36:33 +0100
commit6885eb4f2c7cf8941d4018b36a0b522e77092504 (patch)
tree054b4e3d945b16dcf769e021ac2538fe7ec587c5 /src/tools
parentfeeb6d4e83b28b9a7f88ac7edc7ed95efd4b6eed (diff)
parentdf7f188cfe1b407520549f7374bfd070d83140e5 (diff)
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/vmap4_extractor/model.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 1d4a9c060ea..d0a09271210 100644
--- a/src/tools/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
@@ -145,7 +145,7 @@ Vec3D fixCoordSystem2(Vec3D v)
}
ModelInstance::ModelInstance(MPQFile& f, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
- : scale(0), flags(0)
+ : id(0), scale(0), flags(0)
{
float ff[3];
f.read(&id, 4);