From eb2f863b7d6ff5e1340e31ed6430693ce3d939db Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Tue, 28 Sep 2021 12:25:37 +0200 Subject: [PATCH] Resolve `unused-lambda-capture` warnings --- apps/openmw/mwlua/actions.cpp | 4 ++-- apps/openmw/mwlua/nearbybindings.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwlua/actions.cpp b/apps/openmw/mwlua/actions.cpp index 1f75760f7c..aad70d1a57 100644 --- a/apps/openmw/mwlua/actions.cpp +++ b/apps/openmw/mwlua/actions.cpp @@ -51,8 +51,8 @@ namespace MWLua std::array usedSlots; std::fill(usedSlots.begin(), usedSlots.end(), false); - constexpr int anySlot = -1; - auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView, anySlot](int slot, const Item& item) -> bool + static constexpr int anySlot = -1; + auto tryEquipToSlot = [&actor, &store, &usedSlots, &worldView](int slot, const Item& item) -> bool { auto old_it = slot != anySlot ? store.getSlot(slot) : store.end(); MWWorld::Ptr itemPtr; diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp index 8eae46a9b7..011d0ae9f3 100644 --- a/apps/openmw/mwlua/nearbybindings.cpp +++ b/apps/openmw/mwlua/nearbybindings.cpp @@ -47,8 +47,6 @@ namespace MWLua return LObject(getId(r.mHitObject), worldView->getObjectRegistry()); }); - constexpr int defaultCollisionType = MWPhysics::CollisionType_World | MWPhysics::CollisionType_HeightMap | - MWPhysics::CollisionType_Actor | MWPhysics::CollisionType_Door; api["COLLISION_TYPE"] = LuaUtil::makeReadOnly(context.mLua->sol().create_table_with( "World", MWPhysics::CollisionType_World, "Door", MWPhysics::CollisionType_Door, @@ -56,12 +54,12 @@ namespace MWLua "HeightMap", MWPhysics::CollisionType_HeightMap, "Projectile", MWPhysics::CollisionType_Projectile, "Water", MWPhysics::CollisionType_Water, - "Default", defaultCollisionType)); + "Default", MWPhysics::CollisionType_Default)); - api["castRay"] = [defaultCollisionType](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional options) + api["castRay"] = [](const osg::Vec3f& from, const osg::Vec3f& to, sol::optional options) { MWWorld::Ptr ignore; - int collisionType = defaultCollisionType; + int collisionType = MWPhysics::CollisionType_Default; float radius = 0; if (options) { @@ -80,7 +78,7 @@ namespace MWLua } }; // TODO: async raycasting - /*api["asyncCastRay"] = [luaManager = context.mLuaManager, defaultCollisionType]( + /*api["asyncCastRay"] = [luaManager = context.mLuaManager]( const Callback& luaCallback, const osg::Vec3f& from, const osg::Vec3f& to, sol::optional options) { std::function callback =