Core/Vmaps: Reduce memory used by vmaps (and their size, slightly)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
index 385702a25ad..28a0bd51d25 100644
--- a/src/common/Collision/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
@@ -24,9 +24,9 @@ using G3D::Ray;
 
 namespace VMAP
 {
-    ModelInstance::ModelInstance(ModelSpawn const& spawn, WorldModel* model) : ModelSpawn(spawn), iModel(model)
+    ModelInstance::ModelInstance(ModelSpawn const& spawn, WorldModel* model) : ModelMinimalData(spawn), iModel(model)
     {
-        iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pif() * iRot.y / 180.f, G3D::pif() * iRot.x / 180.f, G3D::pif() * iRot.z / 180.f).inverse();
+        iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pif() * spawn.iRot.y / 180.f, G3D::pif() * spawn.iRot.x / 180.f, G3D::pif() * spawn.iRot.z / 180.f).inverse();
         iInvScale = 1.f / iScale;
     }
 
@@ -152,7 +152,7 @@ namespace VMAP
     bool ModelSpawn::readFromFile(FILE* rf, ModelSpawn& spawn)
     {
         uint32 check = 0, nameLen;
-        check += fread(&spawn.flags, sizeof(uint32), 1, rf);
+        check += fread(&spawn.flags, sizeof(uint8), 1, rf);
         // EoF?
         if (!check)
         {
@@ -160,7 +160,7 @@ namespace VMAP
                 std::cout << "Error reading ModelSpawn!\n";
             return false;
         }
-        check += fread(&spawn.adtId, sizeof(uint16), 1, rf);
+        check += fread(&spawn.adtId, sizeof(uint8), 1, rf);
         check += fread(&spawn.ID, sizeof(uint32), 1, rf);
         check += fread(&spawn.iPos, sizeof(float), 3, rf);
         check += fread(&spawn.iRot, sizeof(float), 3, rf);
@@ -198,8 +198,8 @@ namespace VMAP
     bool ModelSpawn::writeToFile(FILE* wf, ModelSpawn const& spawn)
     {
         uint32 check = 0;
-        check += fwrite(&spawn.flags, sizeof(uint32), 1, wf);
-        check += fwrite(&spawn.adtId, sizeof(uint16), 1, wf);
+        check += fwrite(&spawn.flags, sizeof(uint8), 1, wf);
+        check += fwrite(&spawn.adtId, sizeof(uint8), 1, wf);
         check += fwrite(&spawn.ID, sizeof(uint32), 1, wf);
         check += fwrite(&spawn.iPos, sizeof(float), 3, wf);
         check += fwrite(&spawn.iRot, sizeof(float), 3, wf);