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

make ESMStore setting up itself after loading

Browse source
This commit is contained in:
greye 2012-11-07 15:41:59 +04:00
parent bc218759e9
commit 11c0e6382f
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,7 @@ void ESMStore::load(ESM::ESMReader &esm)
cout << *it << " "; cout << *it << " ";
cout << endl; cout << endl;
*/ */
setUp();
} }
void ESMStore::setUp() void ESMStore::setUp()

3
apps/openmw/mwworld/esmstore.hpp
View file

@ -139,7 +139,6 @@ namespace MWWorld
} }
void load(ESM::ESMReader &esm); void load(ESM::ESMReader &esm);
void setUp();
template <class T> template <class T>
const Store<T> &get() const { const Store<T> &get() const {
@ -164,6 +163,8 @@ namespace MWWorld
return ptr; return ptr;
} }
private:
void setUp();
}; };
template <> template <>

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

@ -188,7 +188,6 @@ 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());