krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

setting up

Browse source
This commit is contained in:
greye 2012-11-06 15:26:55 +04:00
parent 18bb5960e4
commit dccc157f4c
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/esmstore.cpp
View file

@ -60,8 +60,8 @@ void ESMStore::load(ESM::ESMReader &esm)
if (n.val==ESM::REC_DIAL) { if (n.val==ESM::REC_DIAL) {
// dirty hack, but it is better than non-const search() // dirty hack, but it is better than non-const search()
// or friends // or friends
dialogue = const_cast<ESM::Dialogue *>(mDialogs.search(id)); dialogue = &mDialogs.mStatic.back();
assert (dialogue != NULL); assert (dialogue->mId == id);
} else { } else {
dialogue = 0; dialogue = 0;
} }

4
apps/openmw/mwworld/store.hpp
View file

@ -80,6 +80,8 @@ namespace MWWorld
} }
}; };
class ESMStore;
template <class T> template <class T>
class Store : public StoreBase class Store : public StoreBase
{ {
@ -89,6 +91,8 @@ namespace MWWorld
typedef std::map<std::string, T> Dynamic; typedef std::map<std::string, T> Dynamic;
friend class ESMStore;
public: public:
Store() Store()
{} {}

1
apps/openmw/mwworld/worldimp.cpp
View file

@ -188,6 +188,7 @@ namespace MWWorld
mEsm.setEncoding(encoding); mEsm.setEncoding(encoding);
mEsm.open (masterPath.string()); mEsm.open (masterPath.string());
mStore.load (mEsm); mStore.load (mEsm);
mStore.setUp();
mPlayer = new MWWorld::Player (mStore.get<ESM::NPC>().find ("player"), *this); mPlayer = new MWWorld::Player (mStore.get<ESM::NPC>().find ("player"), *this);
mRendering->attachCameraTo(mPlayer->getPlayer()); mRendering->attachCameraTo(mPlayer->getPlayer());