mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-23 18:41:36 +00:00
Code Issues Releases Wiki Activity

Fix GCC build warnings

Browse source
This commit is contained in:
Andrei Kortunov 2020-12-28 12:06:41 +04:00
parent 45f4e69a19
commit 6a12c2b58b
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/aifollow.cpp
View file

@ -119,7 +119,6 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte
auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target); auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target);
if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex) if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex)
{ {
osg::Vec3f::value_type maxSize = 0;
for(auto& follower : followers) for(auto& follower : followers)
{ {
auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y(); auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y();

2
apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp
View file

@ -23,7 +23,7 @@ namespace MWPhysics
int index0, int index0,
const btCollisionObjectWrapper* colObj1Wrap, const btCollisionObjectWrapper* colObj1Wrap,
int partId1, int partId1,
int index1) int index1) override
{ {
if(cp.getDistance() <= 0.0f) if(cp.getDistance() <= 0.0f)
overlapping = true; overlapping = true;

2
apps/openmw/mwphysics/movementsolver.cpp
View file

@ -41,7 +41,7 @@ namespace MWPhysics
m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask; m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask;
mVelocity = Misc::Convert::toBullet(velocity); mVelocity = Misc::Convert::toBullet(velocity);
} }
virtual btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) btScalar addSingleResult(btManifoldPoint & contact, const btCollisionObjectWrapper * colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper * colObj1Wrap, int partId1, int index1) override
{ {
if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject())) if (isActor(colObj0Wrap->getCollisionObject()) && isActor(colObj1Wrap->getCollisionObject()))
return 0.0; return 0.0;