mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-07 03:45:33 +00:00
Code Issues Releases Wiki Activity

Remove unused searchInContainers in WorldModel::getPtr

Browse source
This commit is contained in:
Petr Mikheev 2023-02-19 12:47:33 +01:00
parent 47b7c71c73
commit 1c2f24d1ca
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -680,7 +680,7 @@ namespace MWWorld
{ {
// TODO: caching still doesn't work efficiently here (only works for the one CellStore that the reference is // TODO: caching still doesn't work efficiently here (only works for the one CellStore that the reference is
// in) // in)
Ptr ptr = mWorldModel.getPtr(name, *cellstore, false); Ptr ptr = mWorldModel.getPtr(name, *cellstore);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;

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

@ -294,7 +294,7 @@ MWWorld::CellStore* MWWorld::WorldModel::getCellByPosition(
return getInterior(cellNameInSameWorldSpace); return getInterior(cellNameInSameWorldSpace);
} }
MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name, CellStore& cell, bool searchInContainers) MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name, CellStore& cell)
{ {
if (cell.getState() == CellStore::State_Unloaded) if (cell.getState() == CellStore::State_Unloaded)
cell.preload(); cell.preload();
@ -314,9 +314,6 @@ MWWorld::Ptr MWWorld::WorldModel::getPtr(const ESM::RefId& name, CellStore& cell
if (!ptr.isEmpty() && MWWorld::CellStore::isAccessible(ptr.getRefData(), ptr.getCellRef())) if (!ptr.isEmpty() && MWWorld::CellStore::isAccessible(ptr.getRefData(), ptr.getCellRef()))
return ptr; return ptr;
if (searchInContainers)
return cell.searchInContainer(name);
return Ptr(); return Ptr();
} }

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

@ -86,11 +86,7 @@ namespace MWWorld
Ptr getPtr(const ESM::RefNum& refNum) const; Ptr getPtr(const ESM::RefNum& refNum) const;
Ptr getPtr(const ESM::RefId& name, CellStore& cellStore, bool searchInContainers = false); Ptr getPtr(const ESM::RefId& name, CellStore& cellStore);
///< \param searchInContainers Only affect loaded cells.
/// @note name must be lower case
/// @note name must be lower case
Ptr getPtr(const ESM::RefId& name); Ptr getPtr(const ESM::RefId& name);
template <typename Fn> template <typename Fn>