mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 10:39:41 +00:00
Code Issues Releases Wiki Activity

Update soundgen record verifier messages

Browse source
This commit is contained in:
Capostrophic 2018-08-24 20:20:27 +03:00
parent 5249492a31
commit cf7a8c5775
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/opencs/model/tools/soundgencheck.cpp
View file

@ -9,10 +9,10 @@
CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens, CSMTools::SoundGenCheckStage::SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
const CSMWorld::IdCollection<ESM::Sound> &sounds, const CSMWorld::IdCollection<ESM::Sound> &sounds,
const CSMWorld::RefIdCollection &referenceables) const CSMWorld::RefIdCollection &objects)
: mSoundGens(soundGens), : mSoundGens(soundGens),
mSounds(sounds), mSounds(sounds),
mReferenceables(referenceables) mObjects(objects)
{ {
mIgnoreBaseRecords = false; mIgnoreBaseRecords = false;
} }
@ -37,10 +37,10 @@ void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages &messages
if (!soundGen.mCreature.empty()) if (!soundGen.mCreature.empty())
{ {
CSMWorld::RefIdData::LocalIndex creatureIndex = mReferenceables.getDataSet().searchId(soundGen.mCreature); CSMWorld::RefIdData::LocalIndex creatureIndex = mObjects.getDataSet().searchId(soundGen.mCreature);
if (creatureIndex.first == -1) if (creatureIndex.first == -1)
{ {
messages.push_back(std::make_pair(id, "No such creature '" + soundGen.mCreature + "'")); messages.push_back(std::make_pair(id, "Creature '" + soundGen.mCreature + "' doesn't exist"));
} }
else if (creatureIndex.second != CSMWorld::UniversalId::Type_Creature) else if (creatureIndex.second != CSMWorld::UniversalId::Type_Creature)
{ {
@ -50,10 +50,10 @@ void CSMTools::SoundGenCheckStage::perform(int stage, CSMDoc::Messages &messages
if (soundGen.mSound.empty()) if (soundGen.mSound.empty())
{ {
messages.push_back(std::make_pair(id, "Sound is not specified")); messages.push_back(std::make_pair(id, "Sound is missing"));
} }
else if (mSounds.searchId(soundGen.mSound) == -1) else if (mSounds.searchId(soundGen.mSound) == -1)
{ {
messages.push_back(std::make_pair(id, "No such sound '" + soundGen.mSound + "'")); messages.push_back(std::make_pair(id, "Sound '" + soundGen.mSound + "' doesn't exist"));
} }
} }

4
apps/opencs/model/tools/soundgencheck.hpp
View file

@ -12,13 +12,13 @@ namespace CSMTools
{ {
const CSMWorld::IdCollection<ESM::SoundGenerator> &mSoundGens; const CSMWorld::IdCollection<ESM::SoundGenerator> &mSoundGens;
const CSMWorld::IdCollection<ESM::Sound> &mSounds; const CSMWorld::IdCollection<ESM::Sound> &mSounds;
const CSMWorld::RefIdCollection &mReferenceables; const CSMWorld::RefIdCollection &mObjects;
bool mIgnoreBaseRecords; bool mIgnoreBaseRecords;
public: public:
SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens, SoundGenCheckStage(const CSMWorld::IdCollection<ESM::SoundGenerator> &soundGens,
const CSMWorld::IdCollection<ESM::Sound> &sounds, const CSMWorld::IdCollection<ESM::Sound> &sounds,
const CSMWorld::RefIdCollection &referenceables); const CSMWorld::RefIdCollection &objects);
virtual int setup(); virtual int setup();
///< \return number of steps ///< \return number of steps