From 30558c2434a75ed5e57473b85b1728b2f3e63b29 Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Thu, 14 May 2020 10:00:33 +0300
Subject: [PATCH] Try to resolve CI concerns

---
 .../nifloader/testbulletnifloader.cpp               | 13 -------------
 components/nifbullet/bulletnifloader.cpp            |  5 +++--
 components/nifosg/nifloader.cpp                     | 10 ++++++----
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
index 36f251246..7c2797236 100644
--- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
@@ -349,19 +349,6 @@ namespace
         EXPECT_EQ(*result, expected);
     }
 
-    TEST_F(TestBulletNifLoader, for_root_not_nif_node_should_return_default)
-    {
-        StrictMock<RecordMock> record;
-
-        EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
-        EXPECT_CALL(mNifFile, getRoot(0)).WillOnce(Return(&record));
-        const auto result = mLoader.load(mNifFile);
-
-        Resource::BulletShape expected;
-
-        EXPECT_EQ(*result, expected);
-    }
-
     TEST_F(TestBulletNifLoader, for_default_root_nif_node_should_return_default)
     {
         EXPECT_CALL(mNifFile, numRoots()).WillOnce(Return(1));
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index b1a970f91..15834ffad 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -132,8 +132,9 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
     mStaticMesh.reset();
     mAvoidStaticMesh.reset();
 
-    Nif::Node* node;
-    for (size_t i = 0; i < nif.numRoots(); ++i)
+    Nif::Node* node = nullptr;
+    const size_t numRoots = nif.numRoots();
+    for (size_t i = 0; i < numRoots; ++i)
     {
         Nif::Record* r = nif.getRoot(i);
         assert(r != nullptr);
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index e115ad104..8d08ebef1 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -247,8 +247,9 @@ namespace NifOsg
 
         static void loadKf(Nif::NIFFilePtr nif, KeyframeHolder& target)
         {
-            const Nif::NiSequenceStreamHelper *seq;
-            for (size_t i = 0; i < nif->numRoots(); ++i)
+            const Nif::NiSequenceStreamHelper *seq = nullptr;
+            const size_t numRoots = nif->numRoots();
+            for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record *r = nif->getRoot(i);
                 assert(r != nullptr);
@@ -304,8 +305,9 @@ namespace NifOsg
 
         osg::ref_ptr<osg::Node> load(Nif::NIFFilePtr nif, Resource::ImageManager* imageManager)
         {
-            const Nif::Node* nifNode;
-            for (size_t i = 0; i < nif->numRoots(); ++i)
+            const Nif::Node* nifNode = nullptr;
+            const size_t numRoots = nif->numRoots();
+            for (size_t i = 0; i < numRoots; ++i)
             {
                 const Nif::Record* r = nif->getRoot(i);
                 if ((nifNode = dynamic_cast<const Nif::Node*>(r)))