mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-20 07:53:51 +00:00
constructor & destructor
This commit is contained in:
parent
380cd5ca35
commit
b131f022ba
3 changed files with 4 additions and 9 deletions
|
@ -144,10 +144,7 @@ namespace MWWorld
|
|||
mCellChanged = true;
|
||||
}
|
||||
|
||||
Scene::Scene (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng,
|
||||
const Files::Collections& fileCollections,
|
||||
const std::string& master, const boost::filesystem::path& resDir,
|
||||
bool newGame, Environment& environment, const std::string& encoding, World *world, MWRender::MWScene& scene)
|
||||
Scene::Scene (Environment& environment, World *world, MWRender::MWScene& scene)
|
||||
: mScene (scene), mCurrentCell (0),
|
||||
mCellChanged (false), mEnvironment (environment), mWorld(world)
|
||||
{
|
||||
|
|
|
@ -71,10 +71,7 @@ namespace MWWorld
|
|||
bool adjustPlayerPos = true);
|
||||
public:
|
||||
|
||||
Scene (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng,
|
||||
const Files::Collections& fileCollections,
|
||||
const std::string& master, const boost::filesystem::path& resDir, bool newGame,
|
||||
Environment& environment, const std::string& encoding, World* world, MWRender::MWScene& scene);
|
||||
Scene (Environment& environment, World *world, MWRender::MWScene& scene);
|
||||
|
||||
~Scene();
|
||||
|
||||
|
|
|
@ -310,7 +310,7 @@ namespace MWWorld
|
|||
|
||||
mPhysEngine = physEng;
|
||||
|
||||
mWorldScene = new Scene(renderer, physEng, fileCollections, master, resDir, newGame, environment, encoding, this, mScene);
|
||||
mWorldScene = new Scene(environment, this, mScene);
|
||||
}
|
||||
|
||||
World::~World()
|
||||
|
@ -318,6 +318,7 @@ namespace MWWorld
|
|||
delete mPlayer;
|
||||
delete mSkyManager;
|
||||
delete mGlobalVariables;
|
||||
delete mWorldScene;
|
||||
}
|
||||
|
||||
MWWorld::Player& World::getPlayer()
|
||||
|
|
Loading…
Reference in a new issue