Clean up MSVC warnings

CMakeLists.txt

@@ -585,8 +585,8 @@ if (WIN32)
         # Warnings that aren't enabled normally and don't need to be enabled
         # They're unneeded and sometimes completely retarded warnings that /Wall enables
         # Not going to bother commenting them as they tend to warn on every standard library file
-        4061 4263 4264 4266 4350 4371 4435 4514 4548 4571 4610 4619 4623 4625
-        4626 4628 4640 4668 4710 4711 4768 4820 4826 4917 4946 5032 5039 5045
+        4061 4263 4264 4266 4350 4371 4435 4514 4548 4571 4582 4583 4610 4619 4623 4625
+        4626 4628 4640 4668 4710 4711 4768 4820 4826 4917 4946 5032 5039 5045 5219 5220
 
         # Warnings that are thrown on standard libraries and not OpenMW
         4347 # Non-template function with same name and parameter count as template function

apps/esmtool/esmtool.cpp

@@ -322,7 +322,7 @@ int load(Arguments& info)
     std::string filename = info.filename;
     std::cout << "Loading file: " << filename << std::endl;
 
-    std::list<int> skipped;
+    std::list<uint32_t> skipped;
 
     try {
 

apps/opencs/model/prefs/shortcutsetting.cpp

@@ -13,8 +13,6 @@
 
 namespace CSMPrefs
 {
-    const int ShortcutSetting::MaxKeys;
-
     ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)

apps/openmw/mwmechanics/aicombat.cpp

@@ -263,8 +263,9 @@ namespace MWMechanics
             && ((!storage.mReadyToAttack && !mPathFinder.isPathConstructed())
                 || (storage.mUseCustomDestination && (storage.mCustomDestination - vTargetPos).length() > rangeAttack)))
         {
+            const MWBase::World* world = MWBase::Environment::get().getWorld();
             // Try to build path to the target.
-            const auto halfExtents = MWBase::Environment::get().getWorld()->getPathfindingHalfExtents(actor);
+            const auto halfExtents = world->getPathfindingHalfExtents(actor);
             const auto navigatorFlags = getNavigatorFlags(actor);
             const auto areaCosts = getAreaCosts(actor);
             const auto pathGridGraph = getPathGridGraph(actor.getCell());
@@ -274,11 +275,7 @@ namespace MWMechanics
             {
                 // If there is no path, try to find a point on a line from the actor position to target projected
                 // on navmesh to attack the target from there.
-                const MWBase::World* world = MWBase::Environment::get().getWorld();
-                const auto halfExtents = world->getPathfindingHalfExtents(actor);
                 const auto navigator = world->getNavigator();
-                const auto navigatorFlags = getNavigatorFlags(actor);
-                const auto areaCosts = getAreaCosts(actor);
                 const auto hit = navigator->raycast(halfExtents, vActorPos, vTargetPos, navigatorFlags);
 
                 if (hit.has_value() && (*hit - vTargetPos).length() <= rangeAttack)

apps/openmw/mwworld/esmstore.cpp

@@ -63,9 +63,9 @@ namespace
         // We will replace invalid entries by fixed ones
         std::vector<ESM::NPC> npcsToReplace;
 
-        for (auto it : npcs)
+        for (auto npcIter : npcs)
         {
-            ESM::NPC npc = it.second;
+            ESM::NPC npc = npcIter.second;
             bool changed = false;
 
             const std::string npcFaction = npc.mFaction;

components/misc/frameratelimiter.hpp

@@ -13,8 +13,8 @@ namespace Misc
             explicit FrameRateLimiter(std::chrono::duration<Rep, Ratio> maxFrameDuration,
                                       std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now())
                 : mMaxFrameDuration(std::chrono::duration_cast<std::chrono::steady_clock::duration>(maxFrameDuration))
-                , mLastFrameDuration(0)
                 , mLastMeasurement(now)
+                , mLastFrameDuration(0)
             {}
 
             std::chrono::steady_clock::duration getLastFrameDuration() const