mStore fixed; glibc detected in shutdown process

apps/openmw/mwrender/player.hpp

@@ -22,7 +22,7 @@ namespace MWRender
 
                 Ogre::Camera *getCamera() { return mCamera; }
 
-                std::string getHandle() const { std::cout << "mHandle " << mHandle << std::endl; return mHandle; }
+                std::string getHandle() const { return mHandle; }
     };
 }
 

apps/openmw/mwworld/player.cpp

@@ -17,9 +17,7 @@ namespace MWWorld
         mMale = !(player->flags & ESM::NPC::Female);
         mRace = player->race;
         mPlayer.ref.pos.pos[0] = mPlayer.ref.pos.pos[1] = mPlayer.ref.pos.pos[2] = 0;
-        std::cout << "mData.setHandle" << std::endl;
         std::cout << renderer->getHandle();
-        std::cout << "mData end" << std::endl;
         mPlayer.mData.setHandle (renderer->getHandle());
         mClass = new ESM::Class (*world.getStore().classes.find (player->cls));
     }

apps/openmw/mwworld/scene.cpp

@@ -110,7 +110,7 @@ namespace MWWorld
 
                 if (iter==mActiveCells.end())
                 {
-                    mExteriors[std::make_pair (x, y)].loadExt (x, y, mWorld->getStore(), mEsm);
+                    mExteriors[std::make_pair (x, y)].loadExt (x, y, mWorld->getStore(), mWorld->getEsmReader());
                     Ptr::CellStore *cell = &mExteriors[std::make_pair (x, y)];
 
                     loadCell (cell, new MWRender::ExteriorCellRender (*cell, mEnvironment, mScene));
@@ -180,7 +180,8 @@ namespace MWWorld
         }
 
         // Load cell.
-        mInteriors[cellName].loadInt (cellName, mWorld->getStore(), mEsm);
+        std::cout << "cellName:" << cellName << std::endl;
+        mInteriors[cellName].loadInt (cellName, mWorld->getStore(), mWorld->getEsmReader());
         Ptr::CellStore *cell = &mInteriors[cellName];
 
         loadCell (cell, new MWRender::InteriorCellRender (*cell, mEnvironment, mScene));

apps/openmw/mwworld/scene.hpp

@@ -59,7 +59,6 @@ namespace MWWorld
             MWRender::MWScene mScene;
             Ptr::CellStore *mCurrentCell; // the cell, the player is in
             CellRenderCollection mActiveCells;
-            ESM::ESMReader mEsm;
             std::map<std::string, Ptr::CellStore> mInteriors;
             std::map<std::pair<int, int>, Ptr::CellStore> mExteriors;
             bool mCellChanged;