mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
Code Issues Projects Releases Wiki Activity

for regular IdCollections when loading a record make the record a copy of the existing record first (adresses some incomplete records in some content files)

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-06-30 12:35:34 +02:00
parent b5650f5d4f
commit af59106533
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/opencs/model/world/idcollection.hpp
View File

@ -15,7 +15,10 @@ namespace CSMWorld
void load (ESM::ESMReader& reader, bool base);
void load (const ESXRecordT& record, bool base);
/// \param index Index at which the record can be found.
/// Special values: -2 index unknown, -1 record does not exist yet and therefore
/// does not have an index
void load (const ESXRecordT& record, bool base, int index = -2);
bool tryDelete (const std::string& id);
///< Try deleting \a id. If the id does not exist or can't be deleted the call is ignored.
@ -56,17 +59,28 @@ namespace CSMWorld
else
{
ESXRecordT record;
IdAccessorT().getId (record) = id;
int index = this->searchId (id);
if (index==-1)
IdAccessorT().getId (record) = id;
else
{
record = this->getRecord (index).get();
}
record.load (reader);
load (record, base);
load (record, base, index);
}
}
template<typename ESXRecordT, typename IdAccessorT>
void IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base)
void IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base,
int index)
{
int index = this->searchId (IdAccessorT().getId (record));
if (index==-2)
index = this->searchId (IdAccessorT().getId (record));
if (index==-1)
{