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

resolve Script::mData.mName -> mId, resolve moving ESMStore

Browse source
This commit is contained in:
greye 2012-11-05 17:41:36 +04:00
parent 10ae5d3365
commit 8691eac557
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/record.cpp
View file

@ -1213,7 +1213,7 @@ void Record<ESM::Region>::print()
template<> template<>
void Record<ESM::Script>::print() void Record<ESM::Script>::print()
{ {
std::cout << " Name: " << mData.mData.mName.toString() << std::endl; std::cout << " Name: " << mData.mId << std::endl;
std::cout << " Num Shorts: " << mData.mData.mNumShorts << std::endl; std::cout << " Num Shorts: " << mData.mData.mNumShorts << std::endl;
std::cout << " Num Longs: " << mData.mData.mNumLongs << std::endl; std::cout << " Num Longs: " << mData.mData.mNumLongs << std::endl;

3
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -2,14 +2,13 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <components/esm_store/store.hpp>
#include "../mwbase/windowmanager.hpp" #include "../mwbase/windowmanager.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"

4
apps/openmw/mwmechanics/alchemy.cpp
View file

@ -13,11 +13,11 @@
#include <components/esm/loadgmst.hpp> #include <components/esm/loadgmst.hpp>
#include <components/esm/loadmgef.hpp> #include <components/esm/loadmgef.hpp>
#include <components/esm_store/store.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/containerstore.hpp" #include "../mwworld/containerstore.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
@ -192,7 +192,7 @@ void MWMechanics::Alchemy::updateEffects()
const ESM::Potion *MWMechanics::Alchemy::getRecord() const const ESM::Potion *MWMechanics::Alchemy::getRecord() const
{ {
for (ESMS::RecListWithIDT<ESM::Potion>::MapType::const_iterator iter ( for (MWWorld::RecListWithIDT<ESM::Potion>::MapType::const_iterator iter (
MWBase::Environment::get().getWorld()->getStore().potions.list.begin()); MWBase::Environment::get().getWorld()->getStore().potions.list.begin());
iter!=MWBase::Environment::get().getWorld()->getStore().potions.list.end(); ++iter) iter!=MWBase::Environment::get().getWorld()->getStore().potions.list.end(); ++iter)
{ {

2
apps/openmw/mwworld/reclists.hpp
View file

@ -528,7 +528,7 @@ namespace MWWorld
X ref; X ref;
ref.load (esm); ref.load (esm);
std::string realId = toLower (ref.mData.mName.toString()); std::string realId = toLower (ref.mId);
std::swap (list[realId], ref); std::swap (list[realId], ref);
} }

4
components/esm/loadscpt.cpp
View file

@ -8,8 +8,8 @@ namespace ESM
struct SCHD struct SCHD
{ {
NAME32 mName; NAME32 mName;
SCHDstruct mData; Script::SCHDstruct mData;
}; };
void Script::load(ESMReader &esm) void Script::load(ESMReader &esm)