mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 17:09:40 +00:00
Code Issues Releases Wiki Activity

removed redundant mScript field in ESM::StartScript

Browse source
This commit is contained in:
Marc Zinnschlag 2015-03-03 13:04:57 +01:00
parent 3b8d709583
commit bf92d5cde9
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/esmtool/record.cpp
View file

@ -1253,7 +1253,7 @@ void Record<ESM::Spell>::print()
template<> template<>
void Record<ESM::StartScript>::print() void Record<ESM::StartScript>::print()
{ {
std::cout << "Start Script: " << mData.mScript << std::endl; std::cout << "Start Script: " << mData.mId << std::endl;
std::cout << "Start Data: " << mData.mData << std::endl; std::cout << "Start Data: " << mData.mData << std::endl;
} }

2
apps/openmw/mwscript/globalscripts.cpp
View file

@ -100,7 +100,7 @@ namespace MWScript
mStore.get<ESM::StartScript>().begin(); mStore.get<ESM::StartScript>().begin();
iter != mStore.get<ESM::StartScript>().end(); ++iter) iter != mStore.get<ESM::StartScript>().end(); ++iter)
{ {
scripts.push_back (iter->mScript); scripts.push_back (iter->mId);
} }
// add scripts // add scripts

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

@ -364,19 +364,6 @@ namespace MWWorld
inserted.first->second = scpt; inserted.first->second = scpt;
} }
template <>
inline void Store<ESM::StartScript>::load(ESM::ESMReader &esm, const std::string &id) {
ESM::StartScript s;
s.load(esm);
s.mId = Misc::StringUtils::toLower(s.mScript);
std::pair<typename Static::iterator, bool> inserted = mStatic.insert(std::make_pair(s.mId, s));
if (inserted.second)
mShared.push_back(&inserted.first->second);
else
inserted.first->second = s;
}
template <> template <>
class Store<ESM::LandTexture> : public StoreBase class Store<ESM::LandTexture> : public StoreBase
{ {

4
components/esm/loadsscr.cpp
View file

@ -23,7 +23,7 @@ namespace ESM
hasData = true; hasData = true;
break; break;
case ESM::FourCC<'N','A','M','E'>::value: case ESM::FourCC<'N','A','M','E'>::value:
mScript = esm.getHString(); mId = esm.getHString();
hasName = true; hasName = true;
break; break;
default: default:
@ -38,7 +38,7 @@ namespace ESM
void StartScript::save(ESMWriter &esm) const void StartScript::save(ESMWriter &esm) const
{ {
esm.writeHNString("DATA", mData); esm.writeHNString("DATA", mData);
esm.writeHNString("NAME", mScript); esm.writeHNString("NAME", mId);
} }
} }

2
components/esm/loadsscr.hpp
View file

@ -22,7 +22,7 @@ struct StartScript
static unsigned int sRecordId; static unsigned int sRecordId;
std::string mData; std::string mData;
std::string mId, mScript; std::string mId;
// Load a record and add it to the list // Load a record and add it to the list
void load(ESMReader &esm); void load(ESMReader &esm);