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

Move LiveCellRefBase ctor where it belongs to

Browse source
This commit is contained in:
Emanuel Guevel 2014-05-08 13:47:54 +02:00
parent 2f6d400c62
commit 20cfdd4b43
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,11 @@
#include "class.hpp" #include "class.hpp"
#include "esmstore.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) void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
{ {
mRef = state.mRef; mRef = state.mRef;

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

@ -5,14 +5,7 @@
#include "containerstore.hpp" #include "containerstore.hpp"
#include "class.hpp" #include "class.hpp"
#include "livecellref.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)
{
}
const std::string& MWWorld::Ptr::getTypeName() const const std::string& MWWorld::Ptr::getTypeName() const
{ {

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

@ -7,12 +7,12 @@
#include <sstream> #include <sstream>
#include "cellreflist.hpp" #include "cellreflist.hpp"
#include "livecellref.hpp"
namespace MWWorld namespace MWWorld
{ {
class ContainerStore; class ContainerStore;
class CellStore; class CellStore;
class LiveCellRefBase;
/// \brief Pointer to a LiveCellRef /// \brief Pointer to a LiveCellRef