From e7c48cbe5805afa378dfd8e1db90357e8e7d8ab4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 27 Sep 2013 15:04:30 +0200
Subject: [PATCH] load project files

---
 apps/opencs/model/doc/document.cpp | 19 +++++++++++++++++--
 apps/opencs/model/world/data.cpp   | 15 ++++++++++++++-
 apps/opencs/model/world/data.hpp   |  4 +++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 68e164c797..7f609f9f7e 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -1,6 +1,9 @@
 #include "document.hpp"
+
 #include <cassert>
 
+#include <boost/filesystem.hpp>
+
 void CSMDoc::Document::load (const std::vector<boost::filesystem::path>::const_iterator& begin,
     const std::vector<boost::filesystem::path>::const_iterator& end, bool lastAsModified)
 {
@@ -12,10 +15,10 @@ void CSMDoc::Document::load (const std::vector<boost::filesystem::path>::const_i
         --end2;
 
     for (std::vector<boost::filesystem::path>::const_iterator iter (begin); iter!=end2; ++iter)
-        getData().loadFile (*iter, true);
+        getData().loadFile (*iter, true, false);
 
     if (lastAsModified)
-        getData().loadFile (*end2, false);
+        getData().loadFile (*end2, false, false);
 }
 
 void CSMDoc::Document::addGmsts()
@@ -2164,6 +2167,18 @@ CSMDoc::Document::Document (const std::vector<boost::filesystem::path>& files,
         mData.setDescription ("");
         mData.setAuthor ("");
     }
+/// \todo un-outcomment the else, once loading an existing content file works properly again.
+//    else
+    {
+        if (boost::filesystem::exists (projectPath))
+        {
+            getData().loadFile (projectPath, false, true);
+        }
+        else
+        {
+            /// \todo create new project file with default filters
+        }
+    }
 
     addOptionalGmsts();
     addOptionalGlobals();
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index a5e98fc60c..9227a5965d 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -386,7 +386,7 @@ void CSMWorld::Data::merge()
     mGlobals.merge();
 }
 
-void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
+void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base, bool project)
 {
     ESM::ESMReader reader;
 
@@ -449,6 +449,19 @@ void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
             case ESM::REC_STAT: mReferenceables.load (reader, base, UniversalId::Type_Static); break;
             case ESM::REC_WEAP: mReferenceables.load (reader, base, UniversalId::Type_Weapon); break;
 
+            case ESM::REC_FILT:
+
+                if (project)
+                {
+                    mFilters.load (reader, base);
+                    mFilters.setData (mFilters.getSize()-1,
+                        mFilters.findColumnIndex (CSMWorld::Columns::ColumnId_Scope),
+                        static_cast<int> (CSMFilter::Filter::Scope_Project));
+                    break;
+                }
+
+                // fall through (filter record in a content file is an error with format 0)
+
             default:
 
                 /// \todo throw an exception instead, once all records are implemented
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index eb6325a257..5d7fbd2916 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -145,8 +145,10 @@ namespace CSMWorld
             void merge();
             ///< Merge modified into base.
 
-            void loadFile (const boost::filesystem::path& path, bool base);
+            void loadFile (const boost::filesystem::path& path, bool base, bool project);
             ///< Merging content of a file into base or modified.
+            ///
+            /// \param project load project file instead of content file
 
             bool hasId (const std::string& id) const;