UI Styles: check current style path and default path when searching xml

Author: Xottab-DUTY

src/xrGame/EliteDetector.cpp

@@ -79,7 +79,7 @@ void CUIArtefactDetectorElite::construct(CEliteDetector* p)
 {
     m_parent = p;
     CUIXml uiXml;
-    uiXml.Load(CONFIG_PATH, UI_PATH, "ui_detector_artefact.xml");
+    uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_detector_artefact.xml");
 
     CUIXmlInit xml_init;
     string512 buff;

src/xrGame/MainMenu.cpp

@@ -28,6 +28,8 @@
 #include <shellapi.h>
 #pragma comment(lib, "shell32.lib")
 
+#include <tbb/parallel_for_each.h>
+
 #include "Common/object_broker.h"
 
 #include "account_manager.h"
@@ -150,16 +152,43 @@ CMainMenu::~CMainMenu()
 void CMainMenu::ReadTextureInfo()
 {
     string_path buf;
-    FS_FileSet fset;
-    FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, "\\", "textures_descr\\*.xml"));
-    for (const auto& file : fset)
+    FS_FileSet files;
+
+    const auto UpdateFileSet = [&](pcstr path)
     {
-        string_path fn1, fn2, fn3;
-        _splitpath(file.name.c_str(), fn1, fn2, fn3, 0);
-        xr_strcat(fn3, ".xml");
+        FS.file_list(files, "$game_config$", FS_ListFiles,
+            strconcat(sizeof(buf), buf, path, "\\", "textures_descr\\*.xml")
+        );
+    };
 
-        CUITextureMaster::ParseShTexInfo(fn3);
-    }
+    const auto ParseFileSet = [&]()
+    {
+        /*
+         * Original CoP textures_descr
+         * loading time:
+         * Single-threaded ~80 ms
+         * Multi-threaded  ~40 ms
+         * Just a bit of speedup
+        */
+        tbb::parallel_for_each(files, [](const FS_File& file)
+        {
+            string_path path, name;
+            _splitpath(file.name.c_str(), nullptr, path, name, nullptr);
+            xr_strcat(name, ".xml");
+            path[xr_strlen(path) - 1] = '\0'; // cut the latest '\\'
+
+            CUITextureMaster::ParseShTexInfo(path, name);
+        });
+    };
+
+    UpdateFileSet(UI_PATH_DEFAULT);
+    ParseFileSet();
+
+    if (0 == xr_strcmp(UI_PATH, UI_PATH_DEFAULT))
+        return;
+
+    UpdateFileSet(UI_PATH);
+    ParseFileSet();
 }
 
 void CMainMenu::Activate(bool bActivate)

src/xrGame/Missile.cpp

@@ -32,7 +32,7 @@ void create_force_progress()
 {
     VERIFY(!g_MissileForceShape);
     CUIXml uiXml;
-    uiXml.Load(CONFIG_PATH, UI_PATH, "grenade.xml");
+    uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "grenade.xml");
 
     CUIXmlInit xml_init;
     g_MissileForceShape = new CUIProgressShape();

src/xrGame/ScriptXMLInit.cpp

@@ -37,7 +37,7 @@ void _attach_child(CUIWindow* _child, CUIWindow* _parent)
         _parent->AttachChild(_child);
 }
 
-void CScriptXmlInit::ParseFile(LPCSTR xml_file) { m_xml.Load(CONFIG_PATH, UI_PATH, xml_file); }
+void CScriptXmlInit::ParseFile(LPCSTR xml_file) { m_xml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, xml_file); }
 void CScriptXmlInit::InitWindow(LPCSTR path, int index, CUIWindow* pWnd)
 {
     CUIXmlInit::InitWindow(m_xml, path, index, pWnd);

src/xrGame/UIAchivementsIndicator.cpp

@@ -11,7 +11,7 @@ CUIAchivementIndicator::CUIAchivementIndicator()
     m_achivement_log = new CUIGameLog();
     AttachChild(m_achivement_log);
     CUIXml tmp_xml;
-    tmp_xml.Load(CONFIG_PATH, UI_PATH, "ui_mp_achivements.xml");
+    tmp_xml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_mp_achivements.xml");
     CUIXmlInit::InitWindow(tmp_xml, "mp_achivement_wnd", 0, this);
     CUIXmlInit::InitScrollView(tmp_xml, "mp_achivement_wnd:achivement_list", 0, m_achivement_log);
 }

src/xrGame/UIGameAHunt.cpp

@@ -28,7 +28,7 @@ void CUIGameAHunt::Init(int stage)
         m_pTeamPanels->Init(TEAM_PANELS_AHUNT_XML_NAME, "team_panels_wnd");
 
         CUIXml uiXml;
-        uiXml.Load(CONFIG_PATH, UI_PATH, "ui_game_ahunt.xml");
+        uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_game_ahunt.xml");
 
         CUIXmlInit::InitWindow(uiXml, "global", 0, Window);
         CUIXmlInit::InitTextWnd(uiXml, "fraglimit", 0, m_pFragLimitIndicator);

src/xrGame/UIGameCTA.cpp

@@ -66,7 +66,7 @@ void CUIGameCTA::Init(int stage)
         teamPanels->Init(TEAM_PANELS_XML_NAME, "team_panels_wnd");
 
         CUIXml uiXml;
-        uiXml.Load(CONFIG_PATH, UI_PATH, CTA_GAME_WND_XML);
+        uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, CTA_GAME_WND_XML);
 
         CUIXmlInit::InitWindow(uiXml, "global", 0, Window);
 
@@ -761,7 +761,7 @@ void CUIGameCTA::SetVoteMessage(LPCSTR str)
     if (str)
     {
         CUIXml uiXml;
-        uiXml.Load(CONFIG_PATH, UI_PATH, "ui_game_dm.xml");
+        uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_game_dm.xml");
         m_voteStatusWnd = new UIVoteStatusWnd();
         m_voteStatusWnd->InitFromXML(uiXml);
         m_voteStatusWnd->Show(true);

src/xrGame/UIGameCustom.cpp

@@ -247,7 +247,7 @@ void CUIGameCustom::Load()
         return;
     R_ASSERT(!MsgConfig);
     MsgConfig = new CUIXml();
-    MsgConfig->Load(CONFIG_PATH, UI_PATH, "ui_custom_msgs.xml");
+    MsgConfig->Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_custom_msgs.xml");
     R_ASSERT(!ActorMenu);
     ActorMenu = new CUIActorMenu();
     R_ASSERT(!PdaMenu);

src/xrGame/UIGameDM.cpp

@@ -85,7 +85,7 @@ void CUIGameDM::Init(int stage)
     { // unique
         m_pTeamPanels->Init(TEAM_PANELS_DM_XML_NAME, "team_panels_wnd");
         CUIXml uiXml;
-        uiXml.Load(CONFIG_PATH, UI_PATH, "ui_game_dm.xml");
+        uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_game_dm.xml");
         CUIXmlInit::InitWindow(uiXml, "global", 0, Window);
         m_pMoneyIndicator->InitFromXML(uiXml);
         m_pRankIndicator->InitFromXml(uiXml);
@@ -144,7 +144,7 @@ void CUIGameDM::SetVoteMessage(LPCSTR str)
         if (!m_voteStatusWnd)
         {
             CUIXml uiXml;
-            uiXml.Load(CONFIG_PATH, UI_PATH, "ui_game_dm.xml");
+            uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_game_dm.xml");
             m_voteStatusWnd = new UIVoteStatusWnd();
             m_voteStatusWnd->InitFromXML(uiXml);
         }

src/xrGame/UIGameTDM.cpp

@@ -47,7 +47,7 @@ void CUIGameTDM::Init(int stage)
         m_pTeamPanels->Init(TEAM_PANELS_TDM_XML_NAME, "team_panels_wnd");
 
         CUIXml uiXml, xml2;
-        uiXml.Load(CONFIG_PATH, UI_PATH, "ui_game_tdm.xml");
+        uiXml.Load(CONFIG_PATH, UI_PATH, UI_PATH_DEFAULT, "ui_game_tdm.xml");
 
         CUIXmlInit::InitWindow(uiXml, "global", 0, Window);
         CUIXmlInit::InitStatic(uiXml, "team1_icon", 0, m_team1_icon);