#1890

Author: Robosturm

3rd_party/oxygine-framework/oxygine/res/Resources.cpp

@@ -113,7 +113,7 @@ namespace oxygine
         if (!file.exists() || file.size() == 0)
         {
             CONSOLE_PRINT_MODULE("can't load xml file: '" + xmlFile + "'", GameConsole::eDEBUG, GameConsole::eResources);
-            oxygine::handleErrorPolicy(oxygine::ep_show_error, "Resources::loadXML can't find xml file: " + xmlFile);
+            oxygine::handleErrorPolicy(oxygine::ep_ignore_error, "Resources::loadXML can't find xml file: " + xmlFile);
             return false;
         }
         file.open(QIODevice::ReadOnly);

coreengine/virtualpaths.cpp

@@ -14,6 +14,8 @@ void VirtualPaths::setSearchPath(const QString& userPath, const QStringList& mod
 
     m_searchPath.clear();
 
+    m_searchPath.append({ oxygine::Resource::RCC_PREFIX_PATH });
+
     m_searchPath.append({ userPath });
 
 #ifndef USEAPPCONFIGPATH
@@ -25,12 +27,6 @@ void VirtualPaths::setSearchPath(const QString& userPath, const QStringList& mod
     }
 #endif
 
-    for (const auto & mod : std::as_const(mods))
-    {
-        m_searchPath.append({ userPath + mod, true });
-        m_searchPath.append({ oxygine::Resource::RCC_PREFIX_PATH + mod, true });
-    }
-
 #ifdef DEPLOY_RESOURCES_AS_FOLDER
     m_searchPath.append({ QCoreApplication::applicationDirPath() });
 
@@ -39,7 +35,12 @@ void VirtualPaths::setSearchPath(const QString& userPath, const QStringList& mod
 #endif
 #endif
 
-    m_searchPath.append({ oxygine::Resource::RCC_PREFIX_PATH });
+
+    for (const auto & mod : std::as_const(mods))
+    {
+        m_searchPath.append({ oxygine::Resource::RCC_PREFIX_PATH + mod, true });
+        m_searchPath.append({ userPath + mod, true });
+    }
 
     for (auto & path : m_searchPath)
     {

resource_management/ressourcemanagement.h

@@ -253,7 +253,7 @@ void RessourceManagement<TClass>::loadAll(QStringList& list)
             }
         }
     }
-    for (qint32 i = 0; i < searchPaths.size(); i++)
+    for (qint32 i = searchPaths.size() - 1; i >= 0; i--)
     {
         QString path = searchPaths[i];
         QStringList filter;
@@ -281,7 +281,7 @@ void RessourceManagement<TClass>::loadAll(QStringList& list)
             }
         }
     }
-    for (qint32 i = 0; i < searchPaths.size(); i++)
+    for (qint32 i = searchPaths.size() - 1; i >= 0; i--)
     {
         QString path = searchPaths[i];
         QStringList filter;