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

make Ptr a bit more pointer-like

Browse source
This commit is contained in:
Marc Zinnschlag 2014-02-23 18:17:41 +01:00
parent b72c1c2c58
commit f220867144
3 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwworld/cellstore.cpp
View file

@ -342,26 +342,14 @@ namespace MWWorld
Ptr CellStore::searchInContainer (const std::string& id) Ptr CellStore::searchInContainer (const std::string& id)
{ {
{ if (Ptr ptr = searchInContainerList (mContainers, id))
Ptr ptr = searchInContainerList (mContainers, id); return ptr;
if (!ptr.isEmpty()) if (Ptr ptr = searchInContainerList (mCreatures, id))
return ptr; return ptr;
}
{ if (Ptr ptr = searchInContainerList (mNpcs, id))
Ptr ptr = searchInContainerList (mCreatures, id); return ptr;
if (!ptr.isEmpty())
return ptr;
}
{
Ptr ptr = searchInContainerList (mNpcs, id);
if (!ptr.isEmpty())
return ptr;
}
return Ptr(); return Ptr();
} }

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

@ -55,3 +55,8 @@ MWWorld::ContainerStore *MWWorld::Ptr::getContainerStore() const
{ {
return mContainerStore; return mContainerStore;
} }
MWWorld::Ptr::operator const void *()
{
return mRef;
}

3
apps/openmw/mwworld/ptr.hpp
View file

@ -74,6 +74,9 @@ namespace MWWorld
ContainerStore *getContainerStore() const; ContainerStore *getContainerStore() const;
///< May return a 0-pointer, if reference is not in a container. ///< May return a 0-pointer, if reference is not in a container.
operator const void *();
///< Return a 0-pointer, if Ptr is empty; return a non-0-pointer, if Ptr is not empty
}; };
inline bool operator== (const Ptr& left, const Ptr& right) inline bool operator== (const Ptr& left, const Ptr& right)