mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 09:45:33 +00:00
Code Issues Releases Wiki Activity

constructor & destructor

Browse source
This commit is contained in:
Sebastian Wick 2011-08-01 04:36:23 +02:00
parent 380cd5ca35
commit b131f022ba
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,10 +144,7 @@ namespace MWWorld
mCellChanged = true; mCellChanged = true;
} }
Scene::Scene (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng, Scene::Scene (Environment& environment, World *world, MWRender::MWScene& scene)
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)
: mScene (scene), mCurrentCell (0), : mScene (scene), mCurrentCell (0),
mCellChanged (false), mEnvironment (environment), mWorld(world) mCellChanged (false), mEnvironment (environment), mWorld(world)
{ {

5
apps/openmw/mwworld/scene.hpp
View file

@ -71,10 +71,7 @@ namespace MWWorld
bool adjustPlayerPos = true); bool adjustPlayerPos = true);
public: public:
Scene (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng, Scene (Environment& environment, World *world, MWRender::MWScene& scene);
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();

3
apps/openmw/mwworld/world.cpp
View file

@ -310,7 +310,7 @@ namespace MWWorld
mPhysEngine = physEng; mPhysEngine = physEng;
mWorldScene = new Scene(renderer, physEng, fileCollections, master, resDir, newGame, environment, encoding, this, mScene); mWorldScene = new Scene(environment, this, mScene);
} }
World::~World() World::~World()
@ -318,6 +318,7 @@ namespace MWWorld
delete mPlayer; delete mPlayer;
delete mSkyManager; delete mSkyManager;
delete mGlobalVariables; delete mGlobalVariables;
delete mWorldScene;
} }
MWWorld::Player& World::getPlayer() MWWorld::Player& World::getPlayer()