From df0ee82a3c9f27700ee39ac5175a01fc77912b7a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 2 Apr 2013 23:45:32 +0200
Subject: [PATCH] Loose files should have priority over BSA resources. This
 makes texture replacers work.

---
 apps/openmw/engine.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index ce84b8dfe..dad024c98 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -153,20 +153,6 @@ OMW::Engine::~Engine()
 
 void OMW::Engine::loadBSA()
 {
-    for (std::vector<std::string>::const_iterator archive = mArchives.begin(); archive != mArchives.end(); ++archive)
-    {
-        if (mFileCollections.doesExist(*archive))
-        {
-            const std::string archivePath = mFileCollections.getPath(*archive).string();
-            std::cout << "Adding BSA archive " << archivePath << std::endl;
-            Bsa::addBSA(archivePath);
-        }
-        else
-        {
-            std::cout << "Archive " << *archive << " not found" << std::endl;
-        }
-    }
-
     const Files::PathContainer& dataDirs = mFileCollections.getPaths();
     std::string dataDirectory;
     for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
@@ -175,6 +161,24 @@ void OMW::Engine::loadBSA()
         std::cout << "Data dir " << dataDirectory << std::endl;
         Bsa::addDir(dataDirectory, mFSStrict);
     }
+
+    // BSA resources are put into a separate group. We want loose files to have priority over BSA resources, and this seems
+    // to be the only way to get Ogre to do just that.
+    Ogre::ResourceGroupManager::getSingleton ().createResourceGroup ("GroupBSA");
+
+    for (std::vector<std::string>::const_iterator archive = mArchives.begin(); archive != mArchives.end(); ++archive)
+    {
+        if (mFileCollections.doesExist(*archive))
+        {
+            const std::string archivePath = mFileCollections.getPath(*archive).string();
+            std::cout << "Adding BSA archive " << archivePath << std::endl;
+            Bsa::addBSA(archivePath, "GroupBSA");
+        }
+        else
+        {
+            std::cout << "Archive " << *archive << " not found" << std::endl;
+        }
+    }
 }
 
 // add resources directory