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

Convert pointer to referece where nullptr is not acceptable

Browse source
This commit is contained in:
elsid 2023-05-26 21:58:35 +02:00
parent 1b116240a3
commit 466a7cedbb
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,18 +62,18 @@ namespace
}; };
} }
MWWorld::CellStore& MWWorld::WorldModel::getCellStore(const ESM::Cell* cell) MWWorld::CellStore& MWWorld::WorldModel::getCellStore(const ESM::Cell& cell)
{ {
const auto it = mCells.find(cell->mId); const auto it = mCells.find(cell.mId);
if (it != mCells.end()) if (it != mCells.end())
return it->second; return it->second;
CellStore& cellStore = mCells.emplace_hint(it, cell->mId, CellStore(Cell(*cell), mStore, mReaders))->second; CellStore& cellStore = mCells.emplace_hint(it, cell.mId, CellStore(Cell(cell), mStore, mReaders))->second;
if (cell->mData.mFlags & ESM::Cell::Interior) if (cell.mData.mFlags & ESM::Cell::Interior)
mInteriors.emplace(cell->mName, &cellStore); mInteriors.emplace(cell.mName, &cellStore);
else else
mExteriors.emplace( mExteriors.emplace(
ESM::ExteriorCellLocation(cell->getGridX(), cell->getGridY(), ESM::Cell::sDefaultWorldspaceId), &cellStore); ESM::ExteriorCellLocation(cell.getGridX(), cell.getGridY(), ESM::Cell::sDefaultWorldspaceId), &cellStore);
return cellStore; return cellStore;
} }
@ -386,7 +386,7 @@ MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name)
for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter) for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
{ {
CellStore& cellStore = getCellStore(&(*iter)); CellStore& cellStore = getCellStore(*iter);
Ptr ptr = getPtrAndCache(name, cellStore); Ptr ptr = getPtrAndCache(name, cellStore);
@ -396,7 +396,7 @@ MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name)
for (iter = cells.intBegin(); iter != cells.intEnd(); ++iter) for (iter = cells.intBegin(); iter != cells.intEnd(); ++iter)
{ {
CellStore& cellStore = getCellStore(&(*iter)); CellStore& cellStore = getCellStore(*iter);
Ptr ptr = getPtrAndCache(name, cellStore); Ptr ptr = getPtrAndCache(name, cellStore);
@ -413,7 +413,7 @@ void MWWorld::WorldModel::getExteriorPtrs(const ESM::RefId& name, std::vector<MW
const MWWorld::Store<ESM::Cell>& cells = mStore.get<ESM::Cell>(); const MWWorld::Store<ESM::Cell>& cells = mStore.get<ESM::Cell>();
for (MWWorld::Store<ESM::Cell>::iterator iter = cells.extBegin(); iter != cells.extEnd(); ++iter) for (MWWorld::Store<ESM::Cell>::iterator iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
{ {
CellStore& cellStore = getCellStore(&(*iter)); CellStore& cellStore = getCellStore(*iter);
Ptr ptr = getPtrAndCache(name, cellStore); Ptr ptr = getPtrAndCache(name, cellStore);

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

@ -51,7 +51,7 @@ namespace MWWorld
std::size_t mPtrIndexUpdateCounter = 0; std::size_t mPtrIndexUpdateCounter = 0;
ESM::RefNum mLastGeneratedRefnum; ESM::RefNum mLastGeneratedRefnum;
CellStore& getCellStore(const ESM::Cell* cell); CellStore& getCellStore(const ESM::Cell& cell);
CellStore* getInteriorOrNull(std::string_view name); CellStore* getInteriorOrNull(std::string_view name);
Ptr getPtrAndCache(const ESM::RefId& name, CellStore& cellStore); Ptr getPtrAndCache(const ESM::RefId& name, CellStore& cellStore);