From 3170490a8e089fb6cd85ab58f89babcd160124f9 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Sat, 3 Aug 2013 15:21:11 +0200 Subject: [PATCH] silenced some warnings --- apps/openmw/mwworld/physicssystem.cpp | 2 -- libs/openengine/bullet/physic.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp index 9cfeb854fd..371783bc54 100644 --- a/apps/openmw/mwworld/physicssystem.cpp +++ b/apps/openmw/mwworld/physicssystem.cpp @@ -313,8 +313,6 @@ namespace MWWorld std::pair PhysicsSystem::getFacedHandle(const Ogre::Vector3 &origin_, const Ogre::Quaternion &orient_, float queryDistance) { - Ogre::Vector3 dest_ = origin_ + orient_.yAxis()*queryDistance; - btVector3 origin(origin_.x, origin_.y, origin_.z); std::pair result = mEngine->sphereTest(queryDistance,origin); diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp index da459ac523..ba47b6e64c 100644 --- a/libs/openengine/bullet/physic.cpp +++ b/libs/openengine/bullet/physic.cpp @@ -147,7 +147,7 @@ namespace Physic { mEngine->dynamicsWorld->removeRigidBody(mBody); } - + void PhysicActor::enableCollisionBody() { mEngine->dynamicsWorld->addRigidBody(mBody,CollisionType_Actor,CollisionType_World|CollisionType_HeightMap); @@ -484,7 +484,7 @@ namespace Physic if (it != mCollisionObjectMap.end() ) { RigidBody* body = it->second; - + if(body != NULL) { delete body; @@ -583,7 +583,7 @@ namespace Physic btVector3 aabbMax = pos + radius*btVector3(1.0f, 1.0f, 1.0f); broadphase->aabbTest(aabbMin,aabbMax,callback); - for(int i=0;i (callback.hits.size()); ++i) { float d = (callback.hits[i]->getWorldTransform().getOrigin()-pos).length(); if(daddAction( newActor->mCharacter ); mActorMap[name] = newActor; @@ -648,7 +648,7 @@ namespace Physic PhysicActor* act = it->second; if(act != NULL) { - + delete act; } mActorMap.erase(it);