use std::optional in calcantipodes() for #268

project-imprimis · Jan 21, 2024 · 9ddc7c7 · 9ddc7c7
1 parent a6f6935
commit 9ddc7c7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/engine/model/skelmodel.cpp b/src/engine/model/skelmodel.cpp
@@ -276,18 +276,18 @@ void skelmodel::skeleton::calcantipodes()
         }
         if(i + 1 == schedule.size())
         {
-            int conflict = INT_MAX;
+            std::optional<int> conflict = std::nullopt;
             for(int j = 0; j < numbones; ++j)
             {
                 if(bones[j].group < numbones && bones[j].scheduled < 0)
                 {
-                    conflict = std::min(conflict, std::abs(bones[j].group));
+                    conflict = std::min(conflict.value(), std::abs(bones[j].group));
                 }
             }
-            if(conflict < numbones)
+            if(conflict)
             {
-                bones[conflict].scheduled = schedule.size();
-                schedule.push_back(conflict);
+                bones[conflict.value()].scheduled = schedule.size();
+                schedule.push_back(conflict.value());
             }
         }
     }