Merge remote-tracking branch 'origin/master' into 4.3.4
This commit is contained in:
commit
6885eb4f2c
87 files changed
+4785
-639
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user