diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index f6518f961..8019df5c1 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -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) { diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp index 334e1832a..668b1a448 100644 --- a/apps/openmw/mwworld/scene.hpp +++ b/apps/openmw/mwworld/scene.hpp @@ -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(); diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index d7963439a..69d52c172 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -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()