mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)

Browse Source
This commit is contained in:
Stanislav Bas 2015-07-12 15:20:22 +03:00
parent 2ed182b144
commit c266315a35
4 changed files with 53 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/openmw/mwworld/esmstore.cpp
View File

@ -96,22 +96,21 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
throw std::runtime_error(error.str()); throw std::runtime_error(error.str());
} }
} else { } else {
it->second->load(esm); RecordId id = it->second->load(esm);
std::string id = it->second->getLastAddedRecordId(); if (id.mIsDeleted)
if (it->second->isLastAddedRecordDeleted())
{ {
it->second->eraseStatic(id); it->second->eraseStatic(id.mId);
continue; continue;
} }
if (n.val==ESM::REC_DIAL) { if (n.val==ESM::REC_DIAL) {
dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id)); dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
} else { } else {
dialogue = 0; dialogue = 0;
} }
// Insert the reference into the global lookup // Insert the reference into the global lookup
if (!id.empty() && isCacheableRecord(n.val)) { if (!id.mId.empty() && isCacheableRecord(n.val)) {
mIds[Misc::StringUtils::lowerCase (id)] = n.val; mIds[Misc::StringUtils::lowerCase (id.mId)] = n.val;
} }
} }
listener->setProgress(static_cast<size_t>(esm.getFileOffset() / (float)esm.getFileSize() * 1000)); listener->setProgress(static_cast<size_t>(esm.getFileOffset() / (float)esm.getFileSize() * 1000));
@ -184,13 +183,12 @@ void ESMStore::setUp()
case ESM::REC_LEVC: case ESM::REC_LEVC:
{ {
StoreBase *store = mStores[type]; RecordId id = mStores[type]->read (reader);
store->read (reader);
// FIXME: there might be stale dynamic IDs in mIds from an earlier savegame // FIXME: there might be stale dynamic IDs in mIds from an earlier savegame
// that really should be cleared instead of just overwritten // that really should be cleared instead of just overwritten
mIds[store->getLastAddedRecordId()] = type; mIds[id.mId] = type;
} }
if (type==ESM::REC_NPC_) if (type==ESM::REC_NPC_)

67
apps/openmw/mwworld/store.cpp
View File

@ -44,6 +44,10 @@ namespace
namespace MWWorld namespace MWWorld
{ {
RecordId::RecordId(const std::string &id, bool isDeleted)
: mId(id), mIsDeleted(isDeleted)
{}
template<typename T> template<typename T>
IndexedStore<T>::IndexedStore() IndexedStore<T>::IndexedStore()
{ {
@ -180,7 +184,7 @@ namespace MWWorld
return ptr; return ptr;
} }
template<typename T> template<typename T>
void Store<T>::load(ESM::ESMReader &esm) RecordId Store<T>::load(ESM::ESMReader &esm)
{ {
T record; T record;
record.load(esm); record.load(esm);
@ -190,7 +194,7 @@ namespace MWWorld
if (inserted.second) if (inserted.second)
mShared.push_back(&inserted.first->second); mShared.push_back(&inserted.first->second);
mLastAddedRecord = record; return RecordId(record.mId, ESM::isRecordDeleted(record));
} }
template<typename T> template<typename T>
void Store<T>::setUp() void Store<T>::setUp()
@ -317,25 +321,13 @@ namespace MWWorld
} }
} }
template<typename T> template<typename T>
void Store<T>::read(ESM::ESMReader& reader) RecordId Store<T>::read(ESM::ESMReader& reader)
{ {
T record; T record;
record.load (reader); record.load (reader);
insert (record); insert (record);
mLastAddedRecord = record; return RecordId(record.mId, ESM::isRecordDeleted(record));
}
template<typename T>
std::string Store<T>::getLastAddedRecordId() const
{
return ESM::getRecordId(mLastAddedRecord);
}
template<typename T>
bool Store<T>::isLastAddedRecordDeleted() const
{
return ESM::isRecordDeleted(mLastAddedRecord);
} }
// LandTexture // LandTexture
@ -375,7 +367,7 @@ namespace MWWorld
assert(plugin < mStatic.size()); assert(plugin < mStatic.size());
return mStatic[plugin].size(); return mStatic[plugin].size();
} }
void Store<ESM::LandTexture>::load(ESM::ESMReader &esm, size_t plugin) RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm, size_t plugin)
{ {
ESM::LandTexture lt; ESM::LandTexture lt;
lt.load(esm); lt.load(esm);
@ -389,11 +381,13 @@ namespace MWWorld
ltexl.resize(lt.mIndex+1); ltexl.resize(lt.mIndex+1);
// Store it // Store it
ltexl[lt.mIndex] = mLastAddedRecord = lt; ltexl[lt.mIndex] = lt;
return RecordId(lt.mId, lt.mIsDeleted);
} }
void Store<ESM::LandTexture>::load(ESM::ESMReader &esm) RecordId Store<ESM::LandTexture>::load(ESM::ESMReader &esm)
{ {
load(esm, esm.getIndex()); return load(esm, esm.getIndex());
} }
Store<ESM::LandTexture>::iterator Store<ESM::LandTexture>::begin(size_t plugin) const Store<ESM::LandTexture>::iterator Store<ESM::LandTexture>::begin(size_t plugin) const
{ {
@ -405,16 +399,6 @@ namespace MWWorld
assert(plugin < mStatic.size()); assert(plugin < mStatic.size());
return mStatic[plugin].end(); return mStatic[plugin].end();
} }
std::string Store<ESM::LandTexture>::getLastAddedRecordId() const
{
return ESM::getRecordId(mLastAddedRecord);
}
bool Store<ESM::LandTexture>::isLastAddedRecordDeleted() const
{
return ESM::isRecordDeleted(mLastAddedRecord);
}
// Land // Land
//========================================================================= //=========================================================================
@ -462,7 +446,7 @@ namespace MWWorld
} }
return ptr; return ptr;
} }
void Store<ESM::Land>::load(ESM::ESMReader &esm) RecordId Store<ESM::Land>::load(ESM::ESMReader &esm)
{ {
ESM::Land *ptr = new ESM::Land(); ESM::Land *ptr = new ESM::Land();
ptr->load(esm); ptr->load(esm);
@ -480,6 +464,8 @@ namespace MWWorld
} }
mStatic.push_back(ptr); mStatic.push_back(ptr);
return RecordId(); // No ID and can't be deleted (for now)
} }
void Store<ESM::Land>::setUp() void Store<ESM::Land>::setUp()
{ {
@ -622,7 +608,7 @@ namespace MWWorld
mSharedExt.push_back(&(it->second)); mSharedExt.push_back(&(it->second));
} }
} }
void Store<ESM::Cell>::load(ESM::ESMReader &esm) RecordId Store<ESM::Cell>::load(ESM::ESMReader &esm)
{ {
// Don't automatically assume that a new cell must be spawned. Multiple plugins write to the same cell, // Don't automatically assume that a new cell must be spawned. Multiple plugins write to the same cell,
// and we merge all this data into one Cell object. However, we can't simply search for the cell id, // and we merge all this data into one Cell object. However, we can't simply search for the cell id,
@ -704,6 +690,7 @@ namespace MWWorld
mExt[std::make_pair(cell.mData.mX, cell.mData.mY)] = cell; mExt[std::make_pair(cell.mData.mX, cell.mData.mY)] = cell;
} }
} }
return RecordId("", cell.mIsDeleted);
} }
Store<ESM::Cell>::iterator Store<ESM::Cell>::intBegin() const Store<ESM::Cell>::iterator Store<ESM::Cell>::intBegin() const
{ {
@ -859,7 +846,7 @@ namespace MWWorld
{ {
mCells = &cells; mCells = &cells;
} }
void Store<ESM::Pathgrid>::load(ESM::ESMReader &esm) RecordId Store<ESM::Pathgrid>::load(ESM::ESMReader &esm)
{ {
ESM::Pathgrid pathgrid; ESM::Pathgrid pathgrid;
pathgrid.load(esm); pathgrid.load(esm);
@ -884,6 +871,8 @@ namespace MWWorld
if (!ret.second) if (!ret.second)
ret.first->second = pathgrid; ret.first->second = pathgrid;
} }
return RecordId(); // No ID and can't be deleted (for now)
} }
size_t Store<ESM::Pathgrid>::getSize() const size_t Store<ESM::Pathgrid>::getSize() const
{ {
@ -1035,7 +1024,7 @@ namespace MWWorld
} }
template <> template <>
inline void Store<ESM::Dialogue>::load(ESM::ESMReader &esm) { inline RecordId Store<ESM::Dialogue>::load(ESM::ESMReader &esm) {
// The original letter case of a dialogue ID is saved, because it's printed // The original letter case of a dialogue ID is saved, because it's printed
ESM::Dialogue dialogue; ESM::Dialogue dialogue;
dialogue.load(esm); dialogue.load(esm);
@ -1053,7 +1042,7 @@ namespace MWWorld
found->second.mType = dialogue.mType; found->second.mType = dialogue.mType;
} }
mLastAddedRecord = dialogue; return RecordId(dialogue.mId, dialogue.mIsDeleted);
} }
@ -1061,7 +1050,7 @@ namespace MWWorld
//========================================================================= //=========================================================================
template <> template <>
inline void Store<ESM::Script>::load(ESM::ESMReader &esm) { inline RecordId Store<ESM::Script>::load(ESM::ESMReader &esm) {
ESM::Script script; ESM::Script script;
script.load(esm); script.load(esm);
Misc::StringUtils::toLower(script.mId); Misc::StringUtils::toLower(script.mId);
@ -1072,7 +1061,7 @@ namespace MWWorld
else else
inserted.first->second = script; inserted.first->second = script;
mLastAddedRecord = script; return RecordId(script.mId, script.mIsDeleted);
} }
@ -1080,7 +1069,7 @@ namespace MWWorld
//========================================================================= //=========================================================================
template <> template <>
inline void Store<ESM::StartScript>::load(ESM::ESMReader &esm) inline RecordId Store<ESM::StartScript>::load(ESM::ESMReader &esm)
{ {
ESM::StartScript script; ESM::StartScript script;
script.load(esm); script.load(esm);
@ -1092,7 +1081,7 @@ namespace MWWorld
else else
inserted.first->second = script; inserted.first->second = script;
mLastAddedRecord = script; return RecordId(script.mId);
} }
} }

39
apps/openmw/mwworld/store.hpp
View File

@ -19,6 +19,14 @@ namespace Loading
namespace MWWorld namespace MWWorld
{ {
struct RecordId
{
std::string mId;
bool mIsDeleted;
RecordId(const std::string &id = "", bool isDeleted = false);
};
struct StoreBase struct StoreBase
{ {
virtual ~StoreBase() {} virtual ~StoreBase() {}
@ -28,19 +36,15 @@ namespace MWWorld
virtual size_t getSize() const = 0; virtual size_t getSize() const = 0;
virtual int getDynamicSize() const { return 0; } virtual int getDynamicSize() const { return 0; }
virtual void load(ESM::ESMReader &esm) = 0; virtual RecordId load(ESM::ESMReader &esm) = 0;
virtual bool eraseStatic(const std::string &id) {return false;} virtual bool eraseStatic(const std::string &id) {return false;}
virtual void clearDynamic() {} virtual void clearDynamic() {}
virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const {} virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const {}
virtual void read (ESM::ESMReader& reader) {} virtual RecordId read (ESM::ESMReader& reader) { return RecordId(); }
///< Read into dynamic storage ///< Read into dynamic storage
virtual std::string getLastAddedRecordId() const { return ""; }
///< Returns the last loaded/read ID or empty string if a loaded record has no ID
virtual bool isLastAddedRecordDeleted() const { return false; }
}; };
template <class T> template <class T>
@ -137,8 +141,6 @@ namespace MWWorld
// for heads/hairs in the character creation) // for heads/hairs in the character creation)
std::map<std::string, T> mDynamic; std::map<std::string, T> mDynamic;
T mLastAddedRecord;
typedef std::map<std::string, T> Dynamic; typedef std::map<std::string, T> Dynamic;
typedef std::map<std::string, T> Static; typedef std::map<std::string, T> Static;
@ -185,12 +187,9 @@ namespace MWWorld
bool erase(const std::string &id); bool erase(const std::string &id);
bool erase(const T &item); bool erase(const T &item);
void load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);
void write(ESM::ESMWriter& writer, Loading::Listener& progress) const; void write(ESM::ESMWriter& writer, Loading::Listener& progress) const;
void read(ESM::ESMReader& reader); RecordId read(ESM::ESMReader& reader);
std::string getLastAddedRecordId() const;
bool isLastAddedRecordDeleted() const;
}; };
template <> template <>
@ -199,7 +198,6 @@ namespace MWWorld
// For multiple ESM/ESP files we need one list per file. // For multiple ESM/ESP files we need one list per file.
typedef std::vector<ESM::LandTexture> LandTextureList; typedef std::vector<ESM::LandTexture> LandTextureList;
std::vector<LandTextureList> mStatic; std::vector<LandTextureList> mStatic;
ESM::LandTexture mLastAddedRecord;
public: public:
Store(); Store();
@ -214,14 +212,11 @@ namespace MWWorld
size_t getSize() const; size_t getSize() const;
size_t getSize(size_t plugin) const; size_t getSize(size_t plugin) const;
void load(ESM::ESMReader &esm, size_t plugin); RecordId load(ESM::ESMReader &esm, size_t plugin);
void load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);
iterator begin(size_t plugin) const; iterator begin(size_t plugin) const;
iterator end(size_t plugin) const; iterator end(size_t plugin) const;
std::string getLastAddedRecordId() const;
bool isLastAddedRecordDeleted() const;
}; };
template <> template <>
@ -243,7 +238,7 @@ namespace MWWorld
ESM::Land *search(int x, int y) const; ESM::Land *search(int x, int y) const;
ESM::Land *find(int x, int y) const; ESM::Land *find(int x, int y) const;
void load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);
void setUp(); void setUp();
}; };
@ -293,7 +288,7 @@ namespace MWWorld
void setUp(); void setUp();
void load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);
iterator intBegin() const; iterator intBegin() const;
iterator intEnd() const; iterator intEnd() const;
@ -335,7 +330,7 @@ namespace MWWorld
Store(); Store();
void setCells(Store<ESM::Cell>& cells); void setCells(Store<ESM::Cell>& cells);
void load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);
size_t getSize() const; size_t getSize() const;
void setUp(); void setUp();

6
components/esm/util.hpp
View File

@ -60,12 +60,6 @@ struct Vector3
bool readDeleSubRecord(ESMReader &esm); bool readDeleSubRecord(ESMReader &esm);
void writeDeleSubRecord(ESMWriter &esm); void writeDeleSubRecord(ESMWriter &esm);
template <class RecordT>
std::string getRecordId(const RecordT &record)
{
return record.mId;
}
template <class RecordT> template <class RecordT>
bool isRecordDeleted(const RecordT &record) bool isRecordDeleted(const RecordT &record)
{ {