From 901f10b2bac18a2063cd21798f22b3917e8519b5 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 9 Sep 2012 23:34:52 +0200 Subject: Fixed old model format bugs --- src/graphics/engine/modelfile.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/graphics/engine/modelfile.cpp') diff --git a/src/graphics/engine/modelfile.cpp b/src/graphics/engine/modelfile.cpp index 2049749..f377c88 100644 --- a/src/graphics/engine/modelfile.cpp +++ b/src/graphics/engine/modelfile.cpp @@ -484,6 +484,8 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.used = IOUtils::ReadBinary<1, char>(stream); t.selected = IOUtils::ReadBinary<1, char>(stream); + /* padding */ IOUtils::ReadBinary<2, unsigned int>(stream); + ReadBinaryVertex(stream, t.p1); ReadBinaryVertex(stream, t.p2); ReadBinaryVertex(stream, t.p3); @@ -520,6 +522,8 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.used = IOUtils::ReadBinary<1, char>(stream); t.selected = IOUtils::ReadBinary<1, char>(stream); + /* padding */ IOUtils::ReadBinary<2, unsigned int>(stream); + ReadBinaryVertex(stream, t.p1); ReadBinaryVertex(stream, t.p2); ReadBinaryVertex(stream, t.p3); @@ -848,7 +852,7 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream) if (!triOk || stream.fail()) { - GetLogger()->Error("Error reading model file header\n"); + GetLogger()->Error("Error reading model data\n"); return false; } -- cgit v1.2.3-1-g7c22