mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:10:24 +00:00
Code Issues Releases Wiki Activity

Fix loading empty NiTriShapeData records

Browse source
This commit is contained in:
Chris Robinson 2013-02-28 13:38:48 -08:00
parent f680fba37e
commit 2786cc67f6
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/nif/data.hpp
View file

@ -142,20 +142,18 @@ public:
{ {
ShapeData::read(nif); ShapeData::read(nif);
int tris = nif->getUShort(); /*int tris =*/ nif->getUShort();
if(tris)
{
// We have three times as many vertices as triangles, so this // We have three times as many vertices as triangles, so this
// is always equal to tris*3. // is always equal to tris*3.
int cnt = nif->getInt(); int cnt = nif->getInt();
nif->getShorts(triangles, cnt); nif->getShorts(triangles, cnt);
}
// Read the match list, which lists the vertices that are equal to // Read the match list, which lists the vertices that are equal to
// vertices. We don't actually need need this for anything, so // vertices. We don't actually need need this for anything, so
// just skip it. // just skip it.
int verts = nif->getUShort(); int verts = nif->getUShort();
for(int i=0;i<verts;i++) for(int i=0;i < verts;i++)
{ {
// Number of vertices matching vertex 'i' // Number of vertices matching vertex 'i'
int num = nif->getUShort(); int num = nif->getUShort();

5
components/nif/nif_file.cpp
View file

@ -220,11 +220,10 @@ void NIFFile::parse()
for(size_t i = 0;i < recNum;i++) for(size_t i = 0;i < recNum;i++)
{ {
std::string rec = getString();
//cout << i << ": " << rec.toString() << endl;
Record *r = NULL; Record *r = NULL;
std::string rec = getString();
/* These are all the record types we know how to read. /* These are all the record types we know how to read.
This can be heavily optimized later if needed. For example, a This can be heavily optimized later if needed. For example, a