forked from mirror/openmw-tes3mp
Move LiveCellRefBase ctor where it belongs to
This commit is contained in:
parent
2f6d400c62
commit
20cfdd4b43
3 changed files with 8 additions and 10 deletions
|
@ -10,6 +10,11 @@
|
|||
#include "class.hpp"
|
||||
#include "esmstore.hpp"
|
||||
|
||||
MWWorld::LiveCellRefBase::LiveCellRefBase(std::string type, const ESM::CellRef &cref)
|
||||
: mClass(&Class::get(type)), mRef(cref), mData(mRef)
|
||||
{
|
||||
}
|
||||
|
||||
void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
|
||||
{
|
||||
mRef = state.mRef;
|
||||
|
|
|
@ -5,14 +5,7 @@
|
|||
|
||||
#include "containerstore.hpp"
|
||||
#include "class.hpp"
|
||||
|
||||
|
||||
/* This shouldn't really be here. */
|
||||
MWWorld::LiveCellRefBase::LiveCellRefBase(std::string type, const ESM::CellRef &cref)
|
||||
: mClass(&Class::get(type)), mRef(cref), mData(mRef)
|
||||
{
|
||||
}
|
||||
|
||||
#include "livecellref.hpp"
|
||||
|
||||
const std::string& MWWorld::Ptr::getTypeName() const
|
||||
{
|
||||
|
@ -59,4 +52,4 @@ MWWorld::ContainerStore *MWWorld::Ptr::getContainerStore() const
|
|||
MWWorld::Ptr::operator const void *()
|
||||
{
|
||||
return mRef;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
#include <sstream>
|
||||
|
||||
#include "cellreflist.hpp"
|
||||
#include "livecellref.hpp"
|
||||
|
||||
namespace MWWorld
|
||||
{
|
||||
class ContainerStore;
|
||||
class CellStore;
|
||||
class LiveCellRefBase;
|
||||
|
||||
/// \brief Pointer to a LiveCellRef
|
||||
|
||||
|
|
Loading…
Reference in a new issue