diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 264cf5347..5dcc412c6 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -523,4 +523,5 @@ void OMW::Engine::setCompileAll (bool all) void OMW::Engine::setEncoding(const std::string& encoding) { mEncoding = encoding; -} \ No newline at end of file +} + diff --git a/apps/openmw/mwrender/exterior.cpp b/apps/openmw/mwrender/exterior.cpp index 6e6908a62..9dd82c68f 100644 --- a/apps/openmw/mwrender/exterior.cpp +++ b/apps/openmw/mwrender/exterior.cpp @@ -35,7 +35,7 @@ int ExteriorCellRender::uniqueID = 0; ExteriorCellRender::ExteriorCellRender(ESMS::CellStore &_cell, MWWorld::Environment& environment, MWScene &_scene, MWWorld::PhysicsSystem *physics) - : mCell(_cell), mEnvironment (environment), mScene(_scene), mBase(NULL), mInsert(NULL), mAmbientMode (0), mPhysics(physics) + : mCell(_cell), mEnvironment (environment), mScene(_scene), mPhysics(physics), mBase(NULL), mInsert(NULL), mAmbientMode (0) { uniqueID = uniqueID +1; sg = mScene.getMgr()->createStaticGeometry( "sg" + Ogre::StringConverter::toString(uniqueID)); @@ -350,13 +350,14 @@ void ExteriorCellRender::setAmbientMode() void ExteriorCellRender::show() { + // FIXME: this one may be the bug mBase = mScene.getRoot()->createChildSceneNode(); - + configureAmbient(); configureFog(); - + insertCell(mCell, mEnvironment); - + sg->build(); } diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index e92966470..36a02d2d8 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -25,8 +25,7 @@ void insertCellRefList (T& cellRefList, ESMS::CellStore &cell) { if (!cellRefList.list.empty()) { - const MWWorld::Class& class_ = - MWWorld::Class::get (MWWorld::Ptr (&*cellRefList.list.begin(), &cell)); + //const MWWorld::Class& class_ = MWWorld::Class::get (MWWorld::Ptr (&*cellRefList.list.begin(), &cell)); for (typename T::List::iterator it = cellRefList.list.begin(); it != cellRefList.list.end(); it++) @@ -100,7 +99,6 @@ namespace MWWorld void Scene::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) { SuppressDoingPhysics scopeGuard; - // remove active mEnvironment.mMechanicsManager->removeActor (mWorld->getPlayer().getPlayer());