mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-03 07:45:31 +00:00
Code Issues Releases Wiki Activity

handle deleted records

Browse source
This commit is contained in:
Marc Zinnschlag 2013-02-07 13:26:00 +01:00
parent c1cd8305bc
commit dd2b7d5c63
1 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
apps/opencs/model/world/idcollection.hpp
View file

@ -321,32 +321,54 @@ namespace CSMWorld
{ {
std::string id = reader.getHNOString ("NAME"); std::string id = reader.getHNOString ("NAME");
/// \todo deal with deleted flag
ESXRecordT record;
record.mId = id;
record.load (reader);
int index = searchId (id); int index = searchId (id);
if (index==-1) if (reader.isNextSub ("DELE"))
{ {
// new record reader.skipRecord();
Record<ESXRecordT> record2;
record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
(base ? record2.mBase : record2.mModified) = record;
appendRecord (record2); if (index==-1)
{
// deleting a record that does not exist
// ignore it for now
/// \todo report the problem to the user
}
else if (base)
{
removeRows (index, 1);
}
else
{
mRecords[index].mState = RecordBase::State_Deleted;
}
} }
else else
{ {
// old record ESXRecordT record;
Record<ESXRecordT>& record2 = mRecords[index]; record.mId = id;
record.load (reader);
if (base) if (index==-1)
record2.mBase = record; {
// new record
Record<ESXRecordT> record2;
record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
(base ? record2.mBase : record2.mModified) = record;
appendRecord (record2);
}
else else
record2.setModified (record); {
// old record
Record<ESXRecordT>& record2 = mRecords[index];
if (base)
record2.mBase = record;
else
record2.setModified (record);
}
} }
} }