mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-18 08:06:46 +00:00
Code Issues Releases Wiki Activity

Fix using the wrong id for insertStatic

Browse source
This commit is contained in:
ζeh Matt 2022-08-15 17:04:37 +03:00
parent 6756f4397e
commit 6abb96250f
No known key found for this signature in database
GPG key ID: 18CE582C71A225B0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwworld/esmstore.hpp
View file

@ -249,17 +249,14 @@ namespace MWWorld
template <class T> template <class T>
const T *insertStatic(const T &x) const T *insertStatic(const T &x)
{ {
const std::string id = "$dynamic" + std::to_string(mDynamicCount++);
Store<T> &store = const_cast<Store<T> &>(get<T>()); Store<T> &store = const_cast<Store<T> &>(get<T>());
if (store.search(id) != nullptr) if (store.search(x.mId) != nullptr)
{ {
const std::string msg = "Try to override existing record '" + id + "'"; const std::string msg = "Try to override existing record '" + x.mId + "'";
throw std::runtime_error(msg); throw std::runtime_error(msg);
} }
T record = x;
T *ptr = store.insertStatic(record); T *ptr = store.insertStatic(x);
for (iterator it = mStores.begin(); it != mStores.end(); ++it) { for (iterator it = mStores.begin(); it != mStores.end(); ++it) {
if (it->second == &store) { if (it->second == &store) {
mIds[ptr->mId] = it->first; mIds[ptr->mId] = it->first;