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 WorldModel::mStore instead of MWBase::Environment::get().getESMStore()

Browse source
This commit is contained in:
elsid 2023-05-27 14:37:57 +02:00
parent 183202cd65
commit 60139c6bd5
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,6 @@
#include <components/loadinglistener/loadinglistener.hpp> #include <components/loadinglistener/loadinglistener.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include "../mwbase/environment.hpp"
#include "cellstore.hpp" #include "cellstore.hpp"
#include "esmstore.hpp" #include "esmstore.hpp"
@ -146,7 +144,7 @@ void MWWorld::WorldModel::writeCell(ESM::ESMWriter& writer, CellStore& cell) con
writer.endRecord(ESM::REC_CSTA); writer.endRecord(ESM::REC_CSTA);
} }
MWWorld::WorldModel::WorldModel(const MWWorld::ESMStore& store, ESM::ReadersCache& readers) MWWorld::WorldModel::WorldModel(MWWorld::ESMStore& store, ESM::ReadersCache& readers)
: mStore(store) : mStore(store)
, mReaders(readers) , mReaders(readers)
, mIdCache(Settings::cells().mPointersCacheSize, { ESM::RefId(), nullptr }) , mIdCache(Settings::cells().mPointersCacheSize, { ESM::RefId(), nullptr })
@ -176,7 +174,7 @@ MWWorld::CellStore& MWWorld::WorldModel::getExterior(ESM::ExteriorCellLocation c
record.mMapColor = 0; record.mMapColor = 0;
record.updateId(); record.updateId();
cell = MWBase::Environment::get().getESMStore()->insert(record); cell = mStore.insert(record);
} }
CellStore* cellStore CellStore* cellStore
@ -197,7 +195,7 @@ MWWorld::CellStore& MWWorld::WorldModel::getExterior(ESM::ExteriorCellLocation c
record.mX = cellIndex.mX; record.mX = cellIndex.mX;
record.mY = cellIndex.mY; record.mY = cellIndex.mY;
record.mCellFlags = !ESM4::CELL_Interior; record.mCellFlags = !ESM4::CELL_Interior;
cell = MWBase::Environment::get().getESMStore()->insert(record); cell = mStore.insert(record);
} }
CellStore* cellStore CellStore* cellStore
= &mCells.emplace(cell->mId, CellStore(MWWorld::Cell(*cell), mStore, mReaders)).first->second; = &mCells.emplace(cell->mId, CellStore(MWWorld::Cell(*cell), mStore, mReaders)).first->second;

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

@ -39,7 +39,7 @@ namespace MWWorld
class WorldModel class WorldModel
{ {
public: public:
explicit WorldModel(const MWWorld::ESMStore& store, ESM::ReadersCache& reader); explicit WorldModel(ESMStore& store, ESM::ReadersCache& reader);
WorldModel(const WorldModel&) = delete; WorldModel(const WorldModel&) = delete;
WorldModel& operator=(const WorldModel&) = delete; WorldModel& operator=(const WorldModel&) = delete;
@ -83,7 +83,7 @@ namespace MWWorld
bool readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap); bool readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
private: private:
const MWWorld::ESMStore& mStore; MWWorld::ESMStore& mStore;
ESM::ReadersCache& mReaders; ESM::ReadersCache& mReaders;
mutable std::unordered_map<ESM::RefId, CellStore> mCells; mutable std::unordered_map<ESM::RefId, CellStore> mCells;
mutable std::map<std::string, CellStore*, Misc::StringUtils::CiComp> mInteriors; mutable std::map<std::string, CellStore*, Misc::StringUtils::CiComp> mInteriors;