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

Delete infos of deleted dialogue when loading a content file

Browse Source 
(cherry picked from commit e04e32bcffa3c95f7c2a007d5fcf09641fff0b03)
This commit is contained in:
Stanislav Bas 2015-07-18 20:32:10 +03:00 committed by cc9cii
parent 9a803739ff
commit a120bb2b54
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/opencs/model/world/data.cpp
View File

@ -1118,11 +1118,11 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
if (mJournals.tryDelete (record.mId))
{
/// \todo handle info records
mJournalInfos.removeDialogueInfos(record.mId);
}
else if (mTopics.tryDelete (record.mId))
{
/// \todo handle info records
mTopicInfos.removeDialogueInfos(record.mId);
}
else
{

36
apps/opencs/model/world/infocollection.cpp
View File

@ -187,3 +187,39 @@ CSMWorld::InfoCollection::Range CSMWorld::InfoCollection::getTopicRange (const s
return Range (begin, end);
}
void CSMWorld::InfoCollection::removeDialogueInfos(const std::string& dialogueId)
{
std::string id = Misc::StringUtils::lowerCase(dialogueId);
std::vector<int> erasedRecords;
std::map<std::string, int>::const_iterator current = getIdMap().lower_bound(id);
std::map<std::string, int>::const_iterator end = getIdMap().end();
for (; current != end; ++current)
{
Record<Info> record = getRecord(current->second);
if (Misc::StringUtils::ciEqual(dialogueId, record.get().mTopicId))
{
if (record.mState == RecordBase::State_ModifiedOnly)
{
erasedRecords.push_back(current->second);
}
else
{
record.mState = RecordBase::State_Deleted;
setRecord(current->second, record);
}
}
else
{
break;
}
}
while (!erasedRecords.empty())
{
removeRows(erasedRecords.back(), 1);
erasedRecords.pop_back();
}
}

2
apps/opencs/model/world/infocollection.hpp
View File

@ -44,6 +44,8 @@ namespace CSMWorld
Range getTopicRange (const std::string& topic) const;
///< Return iterators that point to the beginning and past the end of the range for
/// the given topic.
void removeDialogueInfos(const std::string& dialogueId);
};
}