Merge pull request #3191 from akortunov/warnfix

Fix some MSVC warnings

apps/openmw/mwclass/creature.cpp

@@ -82,7 +82,7 @@ namespace MWClass
 
     const Creature::GMST& Creature::getGmst()
     {
-        static const GMST gmst = []
+        static const GMST staticGmst = []
         {
             GMST gmst;
 
@@ -105,7 +105,7 @@ namespace MWClass
 
             return gmst;
         } ();
-        return gmst;
+        return staticGmst;
     }
 
     void Creature::ensureCustomData (const MWWorld::Ptr& ptr) const

apps/openmw/mwclass/npc.cpp

@@ -266,7 +266,7 @@ namespace MWClass
 
     const Npc::GMST& Npc::getGmst()
     {
-        static const GMST gmst = []
+        static const GMST staticGmst = []
         {
             GMST gmst;
 
@@ -296,7 +296,7 @@ namespace MWClass
 
             return gmst;
         } ();
-        return gmst;
+        return staticGmst;
     }
 
     void Npc::ensureCustomData (const MWWorld::Ptr& ptr) const

apps/openmw/mwphysics/physicssystem.cpp

@@ -526,10 +526,10 @@ namespace MWPhysics
 
     void PhysicsSystem::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &updated)
     {
-        if (auto found = mObjects.find(old.mRef); found != mObjects.end())
-            found->second->updatePtr(updated);
-        else if (auto found = mActors.find(old.mRef); found != mActors.end())
-            found->second->updatePtr(updated);
+        if (auto foundObject = mObjects.find(old.mRef); foundObject != mObjects.end())
+            foundObject->second->updatePtr(updated);
+        else if (auto foundActor = mActors.find(old.mRef); foundActor != mActors.end())
+            foundActor->second->updatePtr(updated);
 
         for (auto& [_, actor] : mActors)
         {

components/detournavigator/navigatorimpl.cpp

@@ -69,8 +69,8 @@ namespace DetourNavigator
         if (const btCollisionShape* const avoidShape = shapes.mShapeInstance->getAvoidCollisionShape())
         {
             const ObjectId avoidId(avoidShape);
-            const CollisionShape collisionShape {shapes.mShapeInstance, *avoidShape};
-            if (mNavMeshManager.updateObject(avoidId, collisionShape, transform, AreaType_null))
+            const CollisionShape avoidCollisionShape {shapes.mShapeInstance, *avoidShape};
+            if (mNavMeshManager.updateObject(avoidId, avoidCollisionShape, transform, AreaType_null))
             {
                 updateAvoidShapeId(id, avoidId);
                 result = true;

components/detournavigator/preparednavmeshdatatuple.hpp

@@ -14,11 +14,11 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMesh& v) noexcept
     {
         return std::tuple(
-            Span(v.verts, getVertsLength(v)),
-            Span(v.polys, getPolysLength(v)),
-            Span(v.regs, getRegsLength(v)),
-            Span(v.flags, getFlagsLength(v)),
-            Span(v.areas, getAreasLength(v)),
+            Span(v.verts, static_cast<int>(getVertsLength(v))),
+            Span(v.polys, static_cast<int>(getPolysLength(v))),
+            Span(v.regs, static_cast<int>(getRegsLength(v))),
+            Span(v.flags, static_cast<int>(getFlagsLength(v))),
+            Span(v.areas, static_cast<int>(getAreasLength(v))),
             ArrayRef(v.bmin),
             ArrayRef(v.bmax),
             v.cs,
@@ -31,9 +31,9 @@ namespace DetourNavigator
     constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
     {
         return std::tuple(
-            Span(v.meshes, getMeshesLength(v)),
-            Span(v.verts, getVertsLength(v)),
-            Span(v.tris, getTrisLength(v))
+            Span(v.meshes, static_cast<int>(getMeshesLength(v))),
+            Span(v.verts, static_cast<int>(getVertsLength(v))),
+            Span(v.tris, static_cast<int>(getTrisLength(v)))
         );
     }
 

components/esm/luascripts.cpp

@@ -32,7 +32,7 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
     {
         esm.getSubHeader();
         data.resize(esm.getSubSize());
-        esm.getExact(data.data(), data.size());
+        esm.getExact(data.data(), static_cast<int>(data.size()));
     }
     return data;
 }