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

Use std::stable_sort

Browse source
This commit is contained in:
Evil Eye 2023-08-13 20:26:59 +02:00
parent 3141cf9e28
commit f7edf24356
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -69,14 +69,9 @@ namespace MWGui
std::vector<std::pair<const ESM::Skill*, float>> skills;
skills.reserve(maxSkills);
const auto sortSkills = [&]() {
for (size_t i = skills.size() - 1; i > 0; --i)
{
if (skills[i].second > skills[i - 1].second)
std::swap(skills[i], skills[i - 1]);
else
break;
}
const auto sortByValue
= [](const std::pair<const ESM::Skill*, float>& lhs, const std::pair<const ESM::Skill*, float>& rhs) {
return lhs.second > rhs.second;
};
// Maintain a sorted vector of max maxSkills elements, ordering skills by value and content file order
const MWMechanics::NpcStats& actorStats = actor.getClass().getNpcStats(actor);
@ -86,7 +81,7 @@ namespace MWGui
if (skills.size() < maxSkills)
{
skills.emplace_back(&skill, value);
sortSkills();
std::stable_sort(skills.begin(), skills.end(), sortByValue);
}
else
{
@ -95,7 +90,7 @@ namespace MWGui
{
lowest.first = &skill;
lowest.second = value;
sortSkills();
std::stable_sort(skills.begin(), skills.end(), sortByValue);
}
}
}