mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 12:39:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'editorclone' into 'master'

Browse Source 
Fix some GCC12 warnings

See merge request OpenMW/openmw!2854
This commit is contained in:
psi29a 2023-03-23 19:55:14 +00:00
commit dce809ea95
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/opencs/model/world/collection.hpp
View File

@ -269,11 +269,15 @@ namespace CSMWorld
copy->mState = RecordBase::State_ModifiedOnly; copy->mState = RecordBase::State_ModifiedOnly;
setRecordId(destination, copy->get()); setRecordId(destination, copy->get());
if constexpr (std::is_same_v<ESXRecordT, CSMWorld::CellRef>)
{
if (type == UniversalId::Type_Reference) if (type == UniversalId::Type_Reference)
{ {
CSMWorld::CellRef* ptr = (CSMWorld::CellRef*)&copy->mModified; CSMWorld::CellRef* ptr = (CSMWorld::CellRef*)&copy->mModified;
ptr->mRefNum.mIndex = 0; ptr->mRefNum.mIndex = 0;
} }
}
const int index = getAppendIndex(destination, type); const int index = getAppendIndex(destination, type);
insertRecord(std::move(copy), getAppendIndex(destination, type)); insertRecord(std::move(copy), getAppendIndex(destination, type));

1
apps/openmw_test_suite/esmloader/esmdata.cpp
View File

@ -101,6 +101,7 @@ namespace
ESM::GameSetting setting; ESM::GameSetting setting;
setting.mId = ESM::RefId::stringRefId("setting"); setting.mId = ESM::RefId::stringRefId("setting");
setting.mValue = ESM::Variant(42); setting.mValue = ESM::Variant(42);
setting.mRecordFlags = 0;
settings.push_back(setting); settings.push_back(setting);
EXPECT_EQ(EsmLoader::getGameSetting(settings, "setting"), ESM::Variant(42)); EXPECT_EQ(EsmLoader::getGameSetting(settings, "setting"), ESM::Variant(42));
} }