From 466a7cedbb0b0300ccf66b1570d3b85eecd65175 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 26 May 2023 21:58:35 +0200
Subject: [PATCH] Convert pointer to referece where nullptr is not acceptable

---
 apps/openmw/mwworld/worldmodel.cpp | 18 +++++++++---------
 apps/openmw/mwworld/worldmodel.hpp |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/worldmodel.cpp b/apps/openmw/mwworld/worldmodel.cpp
index 57f09090a2..f1521049dc 100644
--- a/apps/openmw/mwworld/worldmodel.cpp
+++ b/apps/openmw/mwworld/worldmodel.cpp
@@ -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())
         return it->second;
 
-    CellStore& cellStore = mCells.emplace_hint(it, cell->mId, CellStore(Cell(*cell), mStore, mReaders))->second;
-    if (cell->mData.mFlags & ESM::Cell::Interior)
-        mInteriors.emplace(cell->mName, &cellStore);
+    CellStore& cellStore = mCells.emplace_hint(it, cell.mId, CellStore(Cell(cell), mStore, mReaders))->second;
+    if (cell.mData.mFlags & ESM::Cell::Interior)
+        mInteriors.emplace(cell.mName, &cellStore);
     else
         mExteriors.emplace(
-            ESM::ExteriorCellLocation(cell->getGridX(), cell->getGridY(), ESM::Cell::sDefaultWorldspaceId), &cellStore);
+            ESM::ExteriorCellLocation(cell.getGridX(), cell.getGridY(), ESM::Cell::sDefaultWorldspaceId), &cellStore);
 
     return cellStore;
 }
@@ -386,7 +386,7 @@ MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name)
 
     for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
     {
-        CellStore& cellStore = getCellStore(&(*iter));
+        CellStore& cellStore = getCellStore(*iter);
 
         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)
     {
-        CellStore& cellStore = getCellStore(&(*iter));
+        CellStore& cellStore = getCellStore(*iter);
 
         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>();
     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);
 
diff --git a/apps/openmw/mwworld/worldmodel.hpp b/apps/openmw/mwworld/worldmodel.hpp
index 1048a27e84..48cf9624ca 100644
--- a/apps/openmw/mwworld/worldmodel.hpp
+++ b/apps/openmw/mwworld/worldmodel.hpp
@@ -51,7 +51,7 @@ namespace MWWorld
         std::size_t mPtrIndexUpdateCounter = 0;
         ESM::RefNum mLastGeneratedRefnum;
 
-        CellStore& getCellStore(const ESM::Cell* cell);
+        CellStore& getCellStore(const ESM::Cell& cell);
         CellStore* getInteriorOrNull(std::string_view name);
         Ptr getPtrAndCache(const ESM::RefId& name, CellStore& cellStore);