mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 13:09:40 +00:00
Code Issues Releases Wiki Activity

Use meaningful names instead of mSkill1 and mSkill2

Browse source
This commit is contained in:
Andrei Kortunov 2020-06-26 11:47:59 +04:00
parent fde0f20a6f
commit d0fe15b095
6 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/esmtool/record.cpp
View file

@ -740,9 +740,9 @@ void Record<ESM::Faction>::print()
std::cout << " Attribute2 Requirement: " std::cout << " Attribute2 Requirement: "
<< mData.mData.mRankData[i].mAttribute2 << std::endl; << mData.mData.mRankData[i].mAttribute2 << std::endl;
std::cout << " One Skill at Level: " std::cout << " One Skill at Level: "
<< mData.mData.mRankData[i].mSkill1 << std::endl; << mData.mData.mRankData[i].mPrimarySkill << std::endl;
std::cout << " Two Skills at Level: " std::cout << " Two Skills at Level: "
<< mData.mData.mRankData[i].mSkill2 << std::endl; << mData.mData.mRankData[i].mFavouredSkill << std::endl;
std::cout << " Faction Reaction: " std::cout << " Faction Reaction: "
<< mData.mData.mRankData[i].mFactReaction << std::endl; << mData.mData.mRankData[i].mFactReaction << std::endl;
} }

8
apps/opencs/model/world/nestedcoladapterimp.cpp
View file

@ -1143,8 +1143,8 @@ namespace CSMWorld
case 0: return QString(faction.mRanks[subRowIndex].c_str()); case 0: return QString(faction.mRanks[subRowIndex].c_str());
case 1: return rankData.mAttribute1; case 1: return rankData.mAttribute1;
case 2: return rankData.mAttribute2; case 2: return rankData.mAttribute2;
case 3: return rankData.mSkill1; case 3: return rankData.mPrimarySkill;
case 4: return rankData.mSkill2; case 4: return rankData.mFavouredSkill;
case 5: return rankData.mFactReaction; case 5: return rankData.mFactReaction;
default: throw std::runtime_error("Rank subcolumn index out of range"); default: throw std::runtime_error("Rank subcolumn index out of range");
} }
@ -1165,8 +1165,8 @@ namespace CSMWorld
case 0: faction.mRanks[subRowIndex] = value.toString().toUtf8().constData(); break; case 0: faction.mRanks[subRowIndex] = value.toString().toUtf8().constData(); break;
case 1: rankData.mAttribute1 = value.toInt(); break; case 1: rankData.mAttribute1 = value.toInt(); break;
case 2: rankData.mAttribute2 = value.toInt(); break; case 2: rankData.mAttribute2 = value.toInt(); break;
case 3: rankData.mSkill1 = value.toInt(); break; case 3: rankData.mPrimarySkill = value.toInt(); break;
case 4: rankData.mSkill2 = value.toInt(); break; case 4: rankData.mFavouredSkill = value.toInt(); break;
case 5: rankData.mFactReaction = value.toInt(); break; case 5: rankData.mFactReaction = value.toInt(); break;
default: throw std::runtime_error("Rank index out of range"); default: throw std::runtime_error("Rank index out of range");
} }

8
apps/openmw/mwgui/statswindow.cpp
View file

@ -620,10 +620,10 @@ namespace MWGui
text += "\n"; text += "\n";
if (rankData.mSkill1 > 0) if (rankData.mPrimarySkill > 0)
text += "\n#{sNeedOneSkill} " + MyGUI::utility::toString(rankData.mSkill1); text += "\n#{sNeedOneSkill} " + MyGUI::utility::toString(rankData.mPrimarySkill);
if (rankData.mSkill2 > 0) if (rankData.mFavouredSkill > 0)
text += " #{sand} #{sNeedTwoSkills} " + MyGUI::utility::toString(rankData.mSkill2); text += " #{sand} #{sNeedTwoSkills} " + MyGUI::utility::toString(rankData.mFavouredSkill);
} }
} }

6
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -409,21 +409,21 @@ bool MWMechanics::NpcStats::hasSkillsForRank (const std::string& factionId, int
const ESM::RankData& rankData = faction.mData.mRankData[rank]; const ESM::RankData& rankData = faction.mData.mRankData[rank];
if (*iter<rankData.mSkill1) if (*iter<rankData.mPrimarySkill)
return false; return false;
if (skills.size() < 2) if (skills.size() < 2)
return true; return true;
iter++; iter++;
if (*iter<rankData.mSkill2) if (*iter<rankData.mFavouredSkill)
return false; return false;
if (skills.size() < 3) if (skills.size() < 3)
return true; return true;
iter++; iter++;
if (*iter<rankData.mSkill2) if (*iter<rankData.mFavouredSkill)
return false; return false;
return true; return true;

2
components/esm/loadfact.cpp
View file

@ -122,7 +122,7 @@ namespace ESM
for (int i=0; i<10; ++i) for (int i=0; i<10; ++i)
{ {
mData.mRankData[i].mAttribute1 = mData.mRankData[i].mAttribute2 = 0; mData.mRankData[i].mAttribute1 = mData.mRankData[i].mAttribute2 = 0;
mData.mRankData[i].mSkill1 = mData.mRankData[i].mSkill2 = 0; mData.mRankData[i].mPrimarySkill = mData.mRankData[i].mFavouredSkill = 0;
mData.mRankData[i].mFactReaction = 0; mData.mRankData[i].mFactReaction = 0;
mRanks[i].clear(); mRanks[i].clear();

7
components/esm/loadfact.hpp
View file

@ -19,10 +19,11 @@ struct RankData
{ {
int mAttribute1, mAttribute2; // Attribute level int mAttribute1, mAttribute2; // Attribute level
int mSkill1, mSkill2; // Skill level (faction skills given in // Skill level (faction skills given in
// skillID below.) You need one skill at // skillID below.) You need one skill at
// level 'skill1' and two skills at level // level 'mPrimarySkill' and two skills at level
// 'skill2' to advance to this rank. // 'mFavouredSkill' to advance to this rank.
int mPrimarySkill, mFavouredSkill;
int mFactReaction; // Reaction from faction members int mFactReaction; // Reaction from faction members
}; };