From 60085ae4b662cfd5a3f3d4da78994a275904af96 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Thu, 21 Jan 2021 20:01:43 +0100
Subject: Use actual priority of overwrite instead of INT_MAX, and remove
 useless checks.

---
 src/profile.cpp | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/profile.cpp b/src/profile.cpp
index acda465b..6b8d0709 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -232,20 +232,18 @@ void Profile::doWriteModlist()
 
     for (auto iter = m_ModIndexByPriority.crbegin(); iter != m_ModIndexByPriority.crend(); iter++) {
       // the priority order was inverted on load so it has to be inverted again
-      unsigned int index = iter->second;
-      if (index != UINT_MAX) {
-        ModInfo::Ptr modInfo = ModInfo::getByIndex(index);
-        if (!modInfo->isFixedPriority()) {
-          if (modInfo->isForeign()) {
-            file->write("*");
-          } else if (m_ModStatus[index].m_Enabled) {
-            file->write("+");
-          } else {
-            file->write("-");
-          }
-          file->write(modInfo->name().toUtf8());
-          file->write("\r\n");
+      const auto index = iter->second;
+      ModInfo::Ptr modInfo = ModInfo::getByIndex(index);
+      if (!modInfo->isFixedPriority()) {
+        if (modInfo->isForeign()) {
+          file->write("*");
+        } else if (m_ModStatus[index].m_Enabled) {
+          file->write("+");
+        } else {
+          file->write("-");
         }
+        file->write(modInfo->name().toUtf8());
+        file->write("\r\n");
       }
     }
 
@@ -587,13 +585,10 @@ void Profile::updateIndices()
 std::vector<std::tuple<QString, QString, int> > Profile::getActiveMods()
 {
   std::vector<std::tuple<QString, QString, int> > result;
-  for (std::map<int, unsigned int>::const_iterator iter = m_ModIndexByPriority.begin(); iter != m_ModIndexByPriority.end(); iter++ ) {
-    if ((iter->second != UINT_MAX) && m_ModStatus[iter->second].m_Enabled) {
-      ModInfo::Ptr modInfo = ModInfo::getByIndex(iter->second);
-      if (modInfo->hasFlag(ModInfo::FLAG_OVERWRITE))
-        result.push_back(std::make_tuple(modInfo->internalName(), modInfo->absolutePath(), std::numeric_limits<int>::max()));
-      else
-        result.push_back(std::make_tuple(modInfo->internalName(), modInfo->absolutePath(), m_ModStatus[iter->second].m_Priority));
+  for (const auto& [priority, index] : m_ModIndexByPriority) {
+    if (m_ModStatus[index].m_Enabled) {
+      ModInfo::Ptr modInfo = ModInfo::getByIndex(index);
+      result.push_back(std::make_tuple(modInfo->internalName(), modInfo->absolutePath(), m_ModStatus[index].m_Priority));
     }
   }
 
-- 
cgit v1.3.1