mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

mStore fixed; glibc detected in shutdown process

Browse source
This commit is contained in:
Sebastian Wick 2011-08-01 04:53:06 +02:00
parent b131f022ba
commit 6baf904f0f
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/player.hpp
View file

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

2
apps/openmw/mwworld/player.cpp
View file

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

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

@ -110,7 +110,7 @@ namespace MWWorld
if (iter==mActiveCells.end()) 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)]; Ptr::CellStore *cell = &mExteriors[std::make_pair (x, y)];
loadCell (cell, new MWRender::ExteriorCellRender (*cell, mEnvironment, mScene)); loadCell (cell, new MWRender::ExteriorCellRender (*cell, mEnvironment, mScene));
@ -180,7 +180,8 @@ namespace MWWorld
} }
// Load cell. // 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]; Ptr::CellStore *cell = &mInteriors[cellName];
loadCell (cell, new MWRender::InteriorCellRender (*cell, mEnvironment, mScene)); loadCell (cell, new MWRender::InteriorCellRender (*cell, mEnvironment, mScene));

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

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