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

no more getIdType, only setIdType

Browse source
This commit is contained in:
florent.teppe 2022-09-07 18:45:15 +02:00
parent e961ac6f7c
commit 31a14952b7
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/esmstore.cpp
View file

@ -311,9 +311,9 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener, ESM::Dialo
} }
} }
int& ESMStore::getIdType(const std::string& id) void ESMStore::setIdType(const std::string& id, ESM::RecNameInts type)
{ {
return mStoreImp->mIds[id]; mStoreImp->mIds[id] = type;
} }
static std::size_t sTypeIndexCounter = 0; static std::size_t sTypeIndexCounter = 0;

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

@ -165,7 +165,7 @@ namespace MWWorld
template<class T> template<class T>
void removeMissingObjects(Store<T>& store); void removeMissingObjects(Store<T>& store);
int& getIdType(const std::string& id); void setIdType(const std::string& id, ESM::RecNameInts type);
using LuaContent = std::variant< using LuaContent = std::variant<
ESM::LuaScriptsCfg, // data from an omwaddon ESM::LuaScriptsCfg, // data from an omwaddon
@ -227,7 +227,7 @@ namespace MWWorld
T *ptr = store.insert(record); T *ptr = store.insert(record);
if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>) if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
{ {
getIdType(ptr->mId) = T::sRecordId; setIdType(ptr->mId, T::sRecordId);
} }
return ptr; return ptr;
} }
@ -240,7 +240,7 @@ namespace MWWorld
T *ptr = store.insert(x); T *ptr = store.insert(x);
if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>) if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
{ {
getIdType(ptr->mId) = T::sRecordId; setIdType(ptr->mId, T::sRecordId);
} }
return ptr; return ptr;
} }
@ -258,7 +258,7 @@ namespace MWWorld
T *ptr = store.insertStatic(x); T *ptr = store.insertStatic(x);
if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>) if constexpr (std::is_convertible_v<Store<T>*, DynamicStore*>)
{ {
getIdType(ptr->mId) = T::sRecordId; setIdType(ptr->mId, T::sRecordId);
} }
return ptr; return ptr;
} }