mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Avoid unnecessary LiveCellRef copying in a couple of places; change initialization order in WorldModel;

Browse Source
This commit is contained in:
Petr Mikheev 2023-07-24 23:36:24 +02:00
parent 2c989e4057
commit 4d004e4730
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/charactercreation.cpp
View File

@ -245,7 +245,7 @@ namespace MWGui
const ESM::NPC* playerNpc = world->getPlayerPtr().get<ESM::NPC>()->mBase;
const MWWorld::Player player = world->getPlayer();
const MWWorld::Player& player = world->getPlayer();
const ESM::Class* playerClass = world->getStore().get<ESM::Class>().find(playerNpc->mClass);

4
apps/openmw/mwworld/manualref.cpp
View File

@ -16,9 +16,7 @@ namespace
cellRef.blank();
cellRef.mRefID = name;
MWWorld::LiveCellRef<T> ref(cellRef, base);
refValue = ref;
refValue = MWWorld::LiveCellRef<T>(cellRef, base);
ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
}
}

3
apps/openmw/mwworld/worldmodel.hpp
View File

@ -102,6 +102,8 @@ namespace MWWorld
bool readRecord(ESM::ESMReader& reader, uint32_t type, const std::map<int, int>& contentFileMap);
private:
PtrRegistry mPtrRegistry; // defined before mCells because during destruction it should be the last
MWWorld::ESMStore& mStore;
ESM::ReadersCache& mReaders;
mutable std::unordered_map<ESM::RefId, CellStore> mCells;
@ -110,7 +112,6 @@ namespace MWWorld
ESM::Cell mDraftCell;
std::vector<std::pair<ESM::RefId, CellStore*>> mIdCache;
std::size_t mIdCacheIndex = 0;
PtrRegistry mPtrRegistry;
CellStore& getOrInsertCellStore(const ESM::Cell& cell);