mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 04:10:24 +00:00
Code Issues Releases Wiki Activity

Use default initializers for WorldModel members

Browse source
This commit is contained in:
elsid 2023-01-09 10:54:11 +01:00
parent 2f730011dc
commit 48fde4b517
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/worldmodel.cpp
View file

@ -155,8 +155,6 @@ MWWorld::WorldModel::WorldModel(const MWWorld::ESMStore& store, ESM::ReadersCach
, mReaders(readers) , mReaders(readers)
, mIdCache(std::clamp(Settings::Manager::getInt("pointers cache size", "Cells"), 40, 1000), , mIdCache(std::clamp(Settings::Manager::getInt("pointers cache size", "Cells"), 40, 1000),
{ ESM::RefId::sEmpty, nullptr }) { ESM::RefId::sEmpty, nullptr })
, mIdCacheIndex(0)
, mPtrIndexUpdateCounter(0)
{ {
} }

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

@ -45,7 +45,10 @@ namespace MWWorld
mutable std::map<std::string, CellStore, Misc::StringUtils::CiComp> mInteriors; mutable std::map<std::string, CellStore, Misc::StringUtils::CiComp> mInteriors;
mutable std::map<std::pair<int, int>, CellStore> mExteriors; mutable std::map<std::pair<int, int>, CellStore> mExteriors;
IdCache mIdCache; IdCache mIdCache;
std::size_t mIdCacheIndex; std::size_t mIdCacheIndex = 0;
std::unordered_map<ESM::RefNum, Ptr> mPtrIndex;
std::size_t mPtrIndexUpdateCounter = 0;
ESM::RefNum mLastGeneratedRefnum;
WorldModel(const WorldModel&); WorldModel(const WorldModel&);
WorldModel& operator=(const WorldModel&); WorldModel& operator=(const WorldModel&);
@ -58,10 +61,6 @@ namespace MWWorld
void writeCell(ESM::ESMWriter& writer, CellStore& cell) const; void writeCell(ESM::ESMWriter& writer, CellStore& cell) const;
std::unordered_map<ESM::RefNum, Ptr> mPtrIndex;
size_t mPtrIndexUpdateCounter;
ESM::RefNum mLastGeneratedRefnum;
public: public:
void clear(); void clear();