mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

silenced some warnings

Browse source
This commit is contained in:
Marc Zinnschlag 2013-08-03 15:26:53 +02:00
parent 9123afa863
commit 41b2fa985b
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/physicssystem.cpp
View file

@ -313,8 +313,6 @@ namespace MWWorld
std::pair<std::string,float> PhysicsSystem::getFacedHandle(const Ogre::Vector3 &origin_, const Ogre::Quaternion &orient_, float queryDistance) std::pair<std::string,float> 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); btVector3 origin(origin_.x, origin_.y, origin_.z);
std::pair<std::string,btVector3> result = mEngine->sphereTest(queryDistance,origin); std::pair<std::string,btVector3> result = mEngine->sphereTest(queryDistance,origin);

2
libs/openengine/bullet/physic.cpp
View file

@ -583,7 +583,7 @@ namespace Physic
btVector3 aabbMax = pos + radius*btVector3(1.0f, 1.0f, 1.0f); btVector3 aabbMax = pos + radius*btVector3(1.0f, 1.0f, 1.0f);
broadphase->aabbTest(aabbMin,aabbMax,callback); broadphase->aabbTest(aabbMin,aabbMax,callback);
for(int i=0;i<callback.hits.size();i++) for(int i=0;i<static_cast<int> (callback.hits.size()); ++i)
{ {
float d = (callback.hits[i]->getWorldTransform().getOrigin()-pos).length(); float d = (callback.hits[i]->getWorldTransform().getOrigin()-pos).length();
if(d<radius) if(d<radius)