teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Cleanup: Add const to read-only CellRefList access.

Browse source 
OMW Bug #1533
This commit is contained in:
Jordan Ayers 2015-02-22 12:25:10 -06:00
parent 399259a95c
commit 5edafc2a4c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/cellstore.hpp
View file

@ -187,7 +187,7 @@ namespace MWWorld
}
template <class T>
CellRefList<T>& getReadOnly() {
const CellRefList<T>& getReadOnly() {
throw std::runtime_error ("Read Only CellRefList access not available for type " + std::string(typeid(T).name()) );
}
@ -365,7 +365,7 @@ namespace MWWorld
}
template<>
inline CellRefList<ESM::Door>& CellStore::getReadOnly<ESM::Door>()
inline const CellRefList<ESM::Door>& CellStore::getReadOnly<ESM::Door>()
{
return mDoors;
}

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

@ -2799,13 +2799,13 @@ namespace MWWorld
MWWorld::CellStore *next = getInterior( *i );
if ( !next ) continue;
MWWorld::CellRefList<ESM::Door>& doors = next->getReadOnly<ESM::Door>();
CellRefList<ESM::Door>::List& refList = doors.mList;
const MWWorld::CellRefList<ESM::Door>& doors = next->getReadOnly<ESM::Door>();
const CellRefList<ESM::Door>::List& refList = doors.mList;
// Check if any door in the cell leads to an exterior directly
for (CellRefList<ESM::Door>::List::iterator it = refList.begin(); it != refList.end(); ++it)
for (CellRefList<ESM::Door>::List::const_iterator it = refList.begin(); it != refList.end(); ++it)
{
MWWorld::LiveCellRef<ESM::Door>& ref = *it;
const MWWorld::LiveCellRef<ESM::Door>& ref = *it;
if (!ref.mRef.getTeleport()) continue;
if (ref.mRef.getDestCell().empty())
@ -2855,13 +2855,13 @@ namespace MWWorld
return closestMarker;
}
MWWorld::CellRefList<ESM::Door>& doors = next->getReadOnly<ESM::Door>();
CellRefList<ESM::Door>::List& doorList = doors.mList;
const MWWorld::CellRefList<ESM::Door>& doors = next->getReadOnly<ESM::Door>();
const CellRefList<ESM::Door>::List& doorList = doors.mList;
// Check if any door in the cell leads to an exterior directly
for (CellRefList<ESM::Door>::List::iterator it = doorList.begin(); it != doorList.end(); ++it)
for (CellRefList<ESM::Door>::List::const_iterator it = doorList.begin(); it != doorList.end(); ++it)
{
MWWorld::LiveCellRef<ESM::Door>& ref = *it;
const MWWorld::LiveCellRef<ESM::Door>& ref = *it;
if (!ref.mRef.getTeleport()) continue;