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

Move common LiveCellRef fields to the base class

Browse source
This commit is contained in:
Chris Robinson 2013-08-14 01:55:51 -07:00
parent 11166a1a17
commit 74f855e948
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwworld/livecellref.hpp
View file

@ -17,7 +17,16 @@ namespace MWWorld
{ {
std::string mTypeName; std::string mTypeName;
LiveCellRefBase(std::string type) : mTypeName(type) /** Information about this instance, such as 3D location and rotation
* and individual type-dependent data.
*/
ESM::CellRef mRef;
/** runtime-data */
RefData mData;
LiveCellRefBase(std::string type, const ESM::CellRef &cref=ESM::CellRef())
: mTypeName(type), mRef(cref), mData(mRef)
{ } { }
}; };
@ -31,23 +40,15 @@ namespace MWWorld
struct LiveCellRef : public LiveCellRefBase struct LiveCellRef : public LiveCellRefBase
{ {
LiveCellRef(const ESM::CellRef& cref, const X* b = NULL) LiveCellRef(const ESM::CellRef& cref, const X* b = NULL)
: LiveCellRefBase(typeid(X).name()), mBase(b), mRef(cref), mData(mRef) : LiveCellRefBase(typeid(X).name(), cref), mBase(b)
{} {}
LiveCellRef(const X* b = NULL) LiveCellRef(const X* b = NULL)
: LiveCellRefBase(typeid(X).name()), mBase(b), mData(mRef) : LiveCellRefBase(typeid(X).name()), mBase(b)
{} {}
// The object that this instance is based on. // The object that this instance is based on.
const X* mBase; const X* mBase;
/* Information about this instance, such as 3D location and
rotation and individual type-dependent data.
*/
ESM::CellRef mRef;
/// runtime-data
RefData mData;
}; };
// template<typename X> bool operator==(const LiveCellRef<X>& ref, int pRefnum); // template<typename X> bool operator==(const LiveCellRef<X>& ref, int pRefnum);

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

@ -38,8 +38,7 @@ namespace MWWorld
return mPtr ? mPtr->mTypeName : sEmptyString; return mPtr ? mPtr->mTypeName : sEmptyString;
} }
template<typename T> Ptr (MWWorld::LiveCellRefBase *liveCellRef, CellStore *cell)
Ptr (MWWorld::LiveCellRef<T> *liveCellRef, CellStore *cell)
: mContainerStore (0) : mContainerStore (0)
{ {
mPtr = liveCellRef; mPtr = liveCellRef;