mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3037 from akortunov/warnfix

Browse Source 
Fix build warnings
This commit is contained in:
Chris Djali 2020-12-28 14:54:35 +00:00 committed by GitHub
commit 862de7a129
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 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);
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();

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

@ -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;

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

@ -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;

2
components/nifbullet/bulletnifloader.hpp
View File

@ -23,7 +23,7 @@ class btCollisionShape;
namespace Nif
{
class Node;
struct Node;
struct Transformation;
struct NiTriShape;
struct NiTriStrips;