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

Don't crash in StatsWindow for invalid faction rank values

Browse source 
PcRaiseRank: don't allow to raise rank beyond max rank
This commit is contained in:
scrawl 2014-06-18 23:50:55 +02:00
parent 2193977eec
commit c3e4160a0a
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,14 +488,16 @@ namespace MWGui
text += "\n#BF9959#{sExpelled}"; text += "\n#BF9959#{sExpelled}";
else else
{ {
text += std::string("\n#BF9959") + faction->mRanks[it->second]; int rank = it->second;
rank = std::max(0, std::min(9, rank));
text += std::string("\n#BF9959") + faction->mRanks[rank];
if (it->second < 9) if (rank < 9)
{ {
// player doesn't have max rank yet // player doesn't have max rank yet
text += std::string("\n\n#DDC79E#{sNextRank} ") + faction->mRanks[it->second+1]; text += std::string("\n\n#DDC79E#{sNextRank} ") + faction->mRanks[rank+1];
ESM::RankData rankData = faction->mData.mRankData[it->second+1]; ESM::RankData rankData = faction->mData.mRankData[rank+1];
const ESM::Attribute* attr1 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[0]); const ESM::Attribute* attr1 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[0]);
const ESM::Attribute* attr2 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[1]); const ESM::Attribute* attr2 = store.get<ESM::Attribute>().find(faction->mData.mAttribute[1]);

4
apps/openmw/mwscript/statsextensions.cpp
View file

@ -587,7 +587,9 @@ namespace MWScript
} }
else else
{ {
player.getClass().getNpcStats(player).getFactionRanks()[factionID] = player.getClass().getNpcStats(player).getFactionRanks()[factionID] +1; player.getClass().getNpcStats(player).getFactionRanks()[factionID] =
std::min(player.getClass().getNpcStats(player).getFactionRanks()[factionID] +1,
9);
} }
} }
} }