mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 03:15:32 +00:00
Code Issues Releases Wiki Activity

Try to resolve CI concerns

Browse source
This commit is contained in:
Capostrophic 2020-05-14 10:00:33 +03:00
parent 915ffe2241
commit 30558c2434
3 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
View file

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

5
components/nifbullet/bulletnifloader.cpp
View file

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

10
components/nifosg/nifloader.cpp
View file

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