diff --git a/apps/openmw/mwlua/types/actor.cpp b/apps/openmw/mwlua/types/actor.cpp index 42d25789f6..641723afe9 100644 --- a/apps/openmw/mwlua/types/actor.cpp +++ b/apps/openmw/mwlua/types/actor.cpp @@ -41,13 +41,14 @@ namespace MWLua } else { - ESM::RefId recordId = ESM::RefId::deserializeText(std::get(item)); + const auto& stringId = std::get(item); + ESM::RefId recordId = ESM::RefId::deserializeText(stringId); if (old_it != store.end() && old_it->getCellRef().getRefId() == recordId) return { old_it, true }; // already equipped itemPtr = store.search(recordId); if (itemPtr.isEmpty() || itemPtr.getRefData().getCount() == 0) { - Log(Debug::Warning) << "There is no object with recordId='" << recordId << "' in inventory"; + Log(Debug::Warning) << "There is no object with recordId='" << stringId << "' in inventory"; return { store.end(), false }; } } diff --git a/apps/openmw_test_suite/esm/testrefid.cpp b/apps/openmw_test_suite/esm/testrefid.cpp index e947aab4a9..6db0ef3907 100644 --- a/apps/openmw_test_suite/esm/testrefid.cpp +++ b/apps/openmw_test_suite/esm/testrefid.cpp @@ -124,6 +124,12 @@ namespace ESM EXPECT_LT(a, b); } + TEST(ESMRefIdTest, stringRefIdDeserializationReturnsEmptyRefIdForNonExistentValues) + { + RefId id = RefId::deserializeText("this stringrefid should not exist"); + EXPECT_TRUE(id.empty()); + } + TEST(ESMRefIdTest, lessThanIsDefinedForStringRefIdAndRefId) { const StringRefId stringRefId("a"); diff --git a/components/esm/refid.cpp b/components/esm/refid.cpp index 3d489b9b97..8fdcc043f1 100644 --- a/components/esm/refid.cpp +++ b/components/esm/refid.cpp @@ -254,6 +254,8 @@ namespace ESM return ESM::ESM3ExteriorCellRefId(x, y); } - return ESM::RefId::stringRefId(value); + if (auto id = ESM::StringRefId::deserializeExisting(value)) + return *id; + return {}; } } diff --git a/components/esm/stringrefid.cpp b/components/esm/stringrefid.cpp index 2572161853..2f9a8fd6b3 100644 --- a/components/esm/stringrefid.cpp +++ b/components/esm/stringrefid.cpp @@ -21,10 +21,15 @@ namespace ESM const std::string emptyString; - Misc::NotNullPtr getOrInsertString(std::string_view id) + Misc::ScopeGuarded& getRefIds() { static Misc::ScopeGuarded refIds; - const auto locked = refIds.lock(); + return refIds; + } + + Misc::NotNullPtr getOrInsertString(std::string_view id) + { + const auto locked = getRefIds().lock(); auto it = locked->find(id); if (it == locked->end()) it = locked->emplace(id).first; @@ -129,4 +134,15 @@ namespace ESM { return Misc::StringUtils::ciFind(*mValue, subString) != std::string_view::npos; } + + std::optional StringRefId::deserializeExisting(std::string_view value) + { + const auto locked = getRefIds().lock(); + auto it = locked->find(value); + if (it == locked->end()) + return {}; + StringRefId id; + id.mValue = &*it; + return id; + } } diff --git a/components/esm/stringrefid.hpp b/components/esm/stringrefid.hpp index 6679763d55..ec8e898bc7 100644 --- a/components/esm/stringrefid.hpp +++ b/components/esm/stringrefid.hpp @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -46,6 +47,9 @@ namespace ESM friend struct std::hash; + // Similar to the constructor but only returns preexisting ids + static std::optional deserializeExisting(std::string_view value); + private: Misc::NotNullPtr mValue; };