mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 15:45:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert unnecessary universalid changes in Journal record verifier

Browse Source
This commit is contained in:
Capostrophic 2018-08-26 10:45:02 +03:00
parent e1ae7a9b0e
commit 85dc1e4ef2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/opencs/model/tools/journalcheck.cpp
View File

@ -33,7 +33,6 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
std::set<int> questIndices; std::set<int> questIndices;
CSMWorld::InfoCollection::Range range = mJournalInfos.getTopicRange(journal.mId); CSMWorld::InfoCollection::Range range = mJournalInfos.getTopicRange(journal.mId);
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it) for (CSMWorld::InfoCollection::RecordConstIterator it = range.first; it != range.second; ++it)
{ {
@ -57,6 +56,7 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
if (journalInfo.mResponse.empty()) if (journalInfo.mResponse.empty())
{ {
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
messages.add(id, "Missing journal entry text", "", CSMDoc::Message::Severity_Warning); messages.add(id, "Missing journal entry text", "", CSMDoc::Message::Severity_Warning);
} }
@ -65,6 +65,7 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
// Duplicate index // Duplicate index
if (result.second == false) if (result.second == false)
{ {
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_JournalInfo, journalInfo.mId);
std::ostringstream stream; std::ostringstream stream;
stream << "Duplicated quest index " << journalInfo.mData.mJournalIndex; stream << "Duplicated quest index " << journalInfo.mData.mJournalIndex;
messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error); messages.add(id, stream.str(), "", CSMDoc::Message::Severity_Error);
@ -73,10 +74,12 @@ void CSMTools::JournalCheckStage::perform(int stage, CSMDoc::Messages& messages)
if (totalInfoCount == 0) if (totalInfoCount == 0)
{ {
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
messages.add(id, "No related journal entry", "", CSMDoc::Message::Severity_Warning); messages.add(id, "No related journal entry", "", CSMDoc::Message::Severity_Warning);
} }
else if (statusNamedCount > 1) else if (statusNamedCount > 1)
{ {
CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_Journal, journal.mId);
messages.add(id, "Multiple entries with quest status 'Named'", "", CSMDoc::Message::Severity_Error); messages.add(id, "Multiple entries with quest status 'Named'", "", CSMDoc::Message::Severity_Error);
} }
} }