teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove unused variables and fix signed/unsigned comparison to make the compiler happy

Browse source
This commit is contained in:
Jan-Peter Nilsson 2011-02-27 00:48:49 +01:00
parent e290f2f82f
commit 26b780d1ac
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nifbullet/bullet_nif_loader.cpp
View file

@ -85,7 +85,6 @@ void BulletShape::deleteShape(btCollisionShape* mShape)
if(mShape->isCompound()) if(mShape->isCompound())
{ {
btCompoundShape* ms = static_cast<btCompoundShape*>(Shape); btCompoundShape* ms = static_cast<btCompoundShape*>(Shape);
btCompoundShapeChild* child = ms->getChildList();
int a = ms->getNumChildShapes(); int a = ms->getNumChildShapes();
for(int i=0; i <a;i++) for(int i=0; i <a;i++)
{ {
@ -376,12 +375,11 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags
btTriangleMesh *mTriMesh = new btTriangleMesh(); btTriangleMesh *mTriMesh = new btTriangleMesh();
Nif::NiTriShapeData *data = shape->data.getPtr(); Nif::NiTriShapeData *data = shape->data.getPtr();
int numVerts = data->vertices.length / 3;
float* vertices = (float*)data->vertices.ptr; float* vertices = (float*)data->vertices.ptr;
unsigned short* triangles = (unsigned short*)data->triangles.ptr; unsigned short* triangles = (unsigned short*)data->triangles.ptr;
for(int i=0; i < data->triangles.length; i = i+3) for(unsigned int i=0; i < data->triangles.length; i = i+3)
{ {
btVector3 b1(vertices[triangles[i+0]*3]*parentScale,vertices[triangles[i+0]*3+1]*parentScale,vertices[triangles[i+0]*3+2]*parentScale); btVector3 b1(vertices[triangles[i+0]*3]*parentScale,vertices[triangles[i+0]*3+1]*parentScale,vertices[triangles[i+0]*3+2]*parentScale);
btVector3 b2(vertices[triangles[i+1]*3]*parentScale,vertices[triangles[i+1]*3+1]*parentScale,vertices[triangles[i+1]*3+2]*parentScale); btVector3 b2(vertices[triangles[i+1]*3]*parentScale,vertices[triangles[i+1]*3+1]*parentScale,vertices[triangles[i+1]*3+2]*parentScale);
@ -399,4 +397,4 @@ void ManualBulletShapeLoader::load(const std::string &name,const std::string &gr
if (!ptr.isNull()) if (!ptr.isNull())
return; return;
BulletShapeManager::getSingleton().create(name,group,true,this); BulletShapeManager::getSingleton().create(name,group,true,this);
} }