xrGame: textures_descr path now uses current UI style path

OpenXRay · Jul 14, 2018 · d1ff686 · d1ff686
1 parent 99c3826
commit d1ff686
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -149,15 +149,13 @@ CMainMenu::~CMainMenu()
 
 void CMainMenu::ReadTextureInfo()
 {
+    string_path buf;
     FS_FileSet fset;
-    FS.file_list(fset, "$game_config$", FS_ListFiles, "ui\\textures_descr\\*.xml");
-    auto fit = fset.begin();
-    auto fit_e = fset.end();
-
-    for (; fit != fit_e; ++fit)
+    FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, "\\", "textures_descr\\*.xml"));
+    for (const auto& file : fset)
     {
         string_path fn1, fn2, fn3;
-        _splitpath((*fit).name.c_str(), fn1, fn2, fn3, 0);
+        _splitpath(file.name.c_str(), fn1, fn2, fn3, 0);
         xr_strcat(fn3, ".xml");
 
         CUITextureMaster::ParseShTexInfo(fn3);

diff --git a/src/xrGame/ui/UITextureMaster.cpp b/src/xrGame/ui/UITextureMaster.cpp
@@ -28,7 +28,10 @@ void CUITextureMaster::FreeCachedShaders() { m_shaders.clear(); }
 void CUITextureMaster::ParseShTexInfo(LPCSTR xml_file)
 {
     CUIXml xml;
-    xml.Load(CONFIG_PATH, "ui\\textures_descr", xml_file);
+    {
+        string_path buf;
+        xml.Load(CONFIG_PATH, strconcat(sizeof(buf), buf, UI_PATH, "\\", "textures_descr"), xml_file);
+    }
 
     int files_num = xml.GetNodesNum("", 0, "file");