From 2b17f5dde95044c01e07c494417c93f75e87c0cc Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 9 Mar 2014 12:32:21 +0100
Subject: [PATCH] register resources locations on editor startup

---
 apps/opencs/editor.cpp | 19 ++++++++++++++-----
 apps/opencs/editor.hpp |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 2b2f41754b..9eb95fafac 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -11,6 +11,8 @@
 
 #include <components/ogreinit/ogreinit.hpp>
 
+#include <components/bsa/resources.hpp>
+
 #include "model/doc/document.hpp"
 #include "model/world/data.hpp"
 
@@ -18,14 +20,17 @@ CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
 : mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
   mIpcServerName ("org.openmw.OpenCS")
 {
-    Files::PathContainer dataDirs = readConfig();
+    std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
 
-    setupDataFiles (dataDirs);
+    setupDataFiles (config.first);
 
     CSMSettings::UserSettings::instance().loadSettings ("opencs.cfg");
 
     ogreInit.init ((mCfgMgr.getUserConfigPath() / "opencsOgre.log").string());
 
+    Bsa::registerResources (Files::Collections (config.first, !mFsStrict), config.second, true,
+        mFsStrict);
+
     mNewGame.setLocalData (mLocal);
     mFileDialog.setLocalData (mLocal);
 
@@ -58,7 +63,7 @@ void CS::Editor::setupDataFiles (const Files::PathContainer& dataDirs)
     }
 }
 
-Files::PathContainer CS::Editor::readConfig()
+std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfig()
 {
     boost::program_options::variables_map variables;
     boost::program_options::options_description desc("Syntax: opencs <options>\nAllowed options");
@@ -68,7 +73,9 @@ Files::PathContainer CS::Editor::readConfig()
     ("data-local", boost::program_options::value<std::string>()->default_value(""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
     ("encoding", boost::program_options::value<std::string>()->default_value("win1252"))
-    ("resources", boost::program_options::value<std::string>()->default_value("resources"));
+    ("resources", boost::program_options::value<std::string>()->default_value("resources"))
+    ("fallback-archive", boost::program_options::value<std::vector<std::string> >()->
+        default_value(std::vector<std::string>(), "fallback-archive")->multitoken());
 
     boost::program_options::notify(variables);
 
@@ -76,6 +83,8 @@ Files::PathContainer CS::Editor::readConfig()
 
     mDocumentManager.setResourceDir (variables["resources"].as<std::string>());
 
+    mFsStrict = variables["fs-strict"].as<bool>();
+
     Files::PathContainer dataDirs, dataLocal;
     if (!variables["data"].empty()) {
         dataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
@@ -105,7 +114,7 @@ Files::PathContainer CS::Editor::readConfig()
 
     dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
 
-    return dataDirs;
+    return std::make_pair (dataDirs, variables["fallback-archive"].as<std::vector<std::string> >());
 }
 
 void CS::Editor::createGame()
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index 0f1c7a682d..ec417ba8e0 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -41,12 +41,12 @@ namespace CS
             CSVDoc::NewGameDialogue mNewGame;
             CSVSettings::UserSettingsDialog mSettings;
             CSVDoc::FileDialog mFileDialog;
-
             boost::filesystem::path mLocal;
+            bool mFsStrict;
 
             void setupDataFiles (const Files::PathContainer& dataDirs);
 
-            Files::PathContainer readConfig();
+            std::pair<Files::PathContainer, std::vector<std::string> > readConfig();
             ///< \return data paths
 
             // not implemented