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

Remove CellStore::searchViaRefNum (replaced with WorldModel::getPtr)

Browse Source
This commit is contained in:
Petr Mikheev 2023-05-11 00:16:29 +02:00
parent 270ead937b
commit 93342af1f9
3 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwworld/cellstore.cpp
View File

@ -655,13 +655,6 @@ namespace MWWorld
} }
}; };
Ptr CellStore::searchViaRefNum(const ESM::RefNum& refNum)
{
RefNumSearchVisitor searchVisitor(refNum);
forEach(searchVisitor);
return searchVisitor.mFound;
}
float CellStore::getWaterLevel() const float CellStore::getWaterLevel() const
{ {
if (isExterior()) if (isExterior())
@ -1046,7 +1039,7 @@ namespace MWWorld
} }
// Search for the reference. It might no longer exist if its content file was removed. // Search for the reference. It might no longer exist if its content file was removed.
Ptr movedRef = searchViaRefNum(refnum); Ptr movedRef = MWBase::Environment::get().getWorldModel()->getPtr(refnum);
if (movedRef.isEmpty()) if (movedRef.isEmpty())
{ {
Log(Debug::Warning) << "Warning: Dropping moved ref tag for " << refnum.mIndex Log(Debug::Warning) << "Warning: Dropping moved ref tag for " << refnum.mIndex

5
apps/openmw/mwworld/cellstore.hpp
View File

@ -166,11 +166,6 @@ namespace MWWorld
Ptr searchViaActorId(int id); Ptr searchViaActorId(int id);
///< Will return an empty Ptr if cell is not loaded. ///< Will return an empty Ptr if cell is not loaded.
Ptr searchViaRefNum(const ESM::RefNum& refNum);
///< Will return an empty Ptr if cell is not loaded. Does not check references in
/// containers.
/// @note Triggers CellStore hasState flag.
float getWaterLevel() const; float getWaterLevel() const;
bool movedHere(const MWWorld::Ptr& ptr) const; bool movedHere(const MWWorld::Ptr& ptr) const;

18
apps/openmw/mwworld/worldimp.cpp
View File

@ -1880,14 +1880,7 @@ namespace MWWorld
facedObject = rayToObject.mHitObject; facedObject = rayToObject.mHitObject;
if (facedObject.isEmpty() && rayToObject.mHitRefnum.isSet()) if (facedObject.isEmpty() && rayToObject.mHitRefnum.isSet())
{ facedObject = MWBase::Environment::get().getWorldModel()->getPtr(rayToObject.mHitRefnum);
for (CellStore* cellstore : mWorldScene->getActiveCells())
{
facedObject = cellstore->searchViaRefNum(rayToObject.mHitRefnum);
if (!facedObject.isEmpty())
break;
}
}
if (rayToObject.mHit) if (rayToObject.mHit)
mDistanceToFacedObject = (rayToObject.mRatio * maxDistance) - camDist; mDistanceToFacedObject = (rayToObject.mRatio * maxDistance) - camDist;
else else
@ -1904,14 +1897,7 @@ namespace MWWorld
res.mHitNormal = rayRes.mHitNormalWorld; res.mHitNormal = rayRes.mHitNormalWorld;
res.mHitObject = rayRes.mHitObject; res.mHitObject = rayRes.mHitObject;
if (res.mHitObject.isEmpty() && rayRes.mHitRefnum.isSet()) if (res.mHitObject.isEmpty() && rayRes.mHitRefnum.isSet())
{ res.mHitObject = MWBase::Environment::get().getWorldModel()->getPtr(rayRes.mHitRefnum);
for (CellStore* cellstore : mWorldScene->getActiveCells())
{
res.mHitObject = cellstore->searchViaRefNum(rayRes.mHitRefnum);
if (!res.mHitObject.isEmpty())
break;
}
}
return res.mHit; return res.mHit;
} }