From 6a12c2b58b80ca69c93575820be8666d493f60b1 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Mon, 28 Dec 2020 12:06:41 +0400 Subject: [PATCH] Fix GCC build warnings --- apps/openmw/mwmechanics/aifollow.cpp | 1 - apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp | 2 +- apps/openmw/mwphysics/movementsolver.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp index 1e4fb206e..f31be9c10 100644 --- a/apps/openmw/mwmechanics/aifollow.cpp +++ b/apps/openmw/mwmechanics/aifollow.cpp @@ -119,7 +119,6 @@ bool AiFollow::execute (const MWWorld::Ptr& actor, CharacterController& characte auto followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowingByIndex(target); if (followers.size() >= 2 && followers.cbegin()->first != mFollowIndex) { - osg::Vec3f::value_type maxSize = 0; for(auto& follower : followers) { auto halfExtent = MWBase::Environment::get().getWorld()->getHalfExtents(follower.second).y(); diff --git a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp index 8dd5a624f..27e7a390c 100644 --- a/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp +++ b/apps/openmw/mwphysics/closestnotmeconvexresultcallback.cpp @@ -23,7 +23,7 @@ namespace MWPhysics int index0, const btCollisionObjectWrapper* colObj1Wrap, int partId1, - int index1) + int index1) override { if(cp.getDistance() <= 0.0f) overlapping = true; diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp index 69bf04236..9d2957409 100644 --- a/apps/openmw/mwphysics/movementsolver.cpp +++ b/apps/openmw/mwphysics/movementsolver.cpp @@ -41,7 +41,7 @@ namespace MWPhysics m_collisionFilterMask = me->getBroadphaseHandle()->m_collisionFilterMask; 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())) return 0.0;