Dashboard mods: default dash previews by Mark

Author: ohlidalp

resources/dashboards/default_boat-mini.png

@@ -223,18 +223,33 @@ std::string DashBoardManager::determineLayoutFromDashboardMod(CacheEntryPtr& ent
     Ogre::FileInfoListPtr filelist
         = Ogre::ResourceGroupManager::getSingleton().findResourceFileInfo(entry->resource_group, fmt::format("{}*.layout", basename));
 
-    std::string layout;
+    std::string match_xph, match_rpm;
     for (Ogre::FileInfo& fileinfo : *filelist)
     {
         if (m_actor->ar_driveable == TRUCK)
         {
+            const int redlineRPM = (int)m_actor->ar_engine->getShiftUpRPM();
             const char desiredX = App::gfx_speedo_imperial->getBool() ? 'm' : 'k';
-            layout = DashBestXPH(desiredX, layout, fileinfo.filename);
-            const float redlineRPM = m_actor->ar_engine->getShiftUpRPM();
-            layout = DashBestRPM(redlineRPM, layout, fileinfo.filename);
+            if (DashRPM(fileinfo.filename) >= redlineRPM && DashXPH(fileinfo.filename) == desiredX)
+            {
+                return fileinfo.filename; // perfect match
+            }
+            else if (DashXPH(fileinfo.filename) == desiredX)
+            {
+                match_xph = fileinfo.filename;
+            }
+            else if (DashRPM(fileinfo.filename) >= redlineRPM)
+            {
+                match_rpm = fileinfo.filename;
+            }
+        }
+        else // boat
+        {
+            return fileinfo.filename;
         }
     }
-    return layout;
+    // No ideal match? Return match we have.
+    return (match_xph != "") ? match_xph : match_rpm;
 }
 
 void DashBoardManager::loadDashBoard(std::string const& filename, BitMask_t flags)