mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 15:40:18 +00:00
Code Issues Projects Releases Wiki Activity

Add missing UniversalId::mClass initialization

Browse Source
This commit is contained in:
elsid 2023-12-31 14:56:59 +01:00
parent c97d0b5252
commit 94409ce172
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/opencs/model/world/universalid.cpp
View File

@ -221,6 +221,23 @@ namespace
return std::to_string(value); return std::to_string(value);
} }
CSMWorld::UniversalId::Class getClassByType(CSMWorld::UniversalId::Type type)
{
if (const auto it
= std::find_if(std::begin(sIdArg), std::end(sIdArg), [&](const TypeData& v) { return v.mType == type; });
it != std::end(sIdArg))
return it->mClass;
if (const auto it = std::find_if(
std::begin(sIndexArg), std::end(sIndexArg), [&](const TypeData& v) { return v.mType == type; });
it != std::end(sIndexArg))
return it->mClass;
if (const auto it
= std::find_if(std::begin(sNoArg), std::end(sNoArg), [&](const TypeData& v) { return v.mType == type; });
it != std::end(sNoArg))
return it->mClass;
throw std::logic_error("invalid UniversalId type: " + std::to_string(type));
}
} }
CSMWorld::UniversalId::UniversalId(const std::string& universalId) CSMWorld::UniversalId::UniversalId(const std::string& universalId)
@ -330,7 +347,8 @@ CSMWorld::UniversalId::UniversalId(Type type, ESM::RefId id)
} }
CSMWorld::UniversalId::UniversalId(Type type, const UniversalId& id) CSMWorld::UniversalId::UniversalId(Type type, const UniversalId& id)
: mType(type) : mClass(getClassByType(type))
, mType(type)
, mValue(id.mValue) , mValue(id.mValue)
{ {
} }