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

Remove now redundant NPC fields checks

Browse source
This commit is contained in:
Capostrophic 2018-09-03 16:57:01 +03:00
parent 015cd6064f
commit 5d1c1f25f7
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/opencs/model/tools/referenceablecheck.cpp
View file

@ -667,9 +667,6 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
return; return;
short level(npc.mNpdt.mLevel); short level(npc.mNpdt.mLevel);
char disposition(npc.mNpdt.mDisposition);
char reputation(npc.mNpdt.mReputation);
char rank(npc.mNpdt.mRank);
int gold(npc.mNpdt.mGold); int gold(npc.mNpdt.mGold);
if (npc.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS) //12 = autocalculated if (npc.mNpdtType == ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS) //12 = autocalculated
@ -719,22 +716,8 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
else if (mRaces.searchId (npc.mRace) == -1) else if (mRaces.searchId (npc.mRace) == -1)
messages.add(id, "Race '" + npc.mRace + "' does not exist", "", CSMDoc::Message::Severity_Error); messages.add(id, "Race '" + npc.mRace + "' does not exist", "", CSMDoc::Message::Severity_Error);
if (disposition < 0) if (!npc.mFaction.empty() && mFactions.searchId(npc.mFaction) == -1)
messages.add(id, "Disposition is negative", "", CSMDoc::Message::Severity_Warning);
if (reputation < 0)
{
messages.add(id, "Reputation is negative", "", CSMDoc::Message::Severity_Warning);
}
if (!npc.mFaction.empty())
{
if (rank < 0)
messages.add(id, "Faction rank is negative", "", CSMDoc::Message::Severity_Warning);
if (mFactions.searchId(npc.mFaction) == -1)
messages.add(id, "Faction '" + npc.mFaction + "' does not exist", "", CSMDoc::Message::Severity_Error); messages.add(id, "Faction '" + npc.mFaction + "' does not exist", "", CSMDoc::Message::Severity_Error);
}
if (npc.mHead.empty()) if (npc.mHead.empty())
messages.add(id, "Head is missing", "", CSMDoc::Message::Severity_Error); messages.add(id, "Head is missing", "", CSMDoc::Message::Severity_Error);