From 95937596da04664a6d0ff73b5de6676dc41af8db Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Mon, 11 Jul 2016 18:24:52 +0100
Subject: [PATCH] Make all loot_db member variables private

---
 src/api/api.cpp     | 8 ++++----
 src/api/loot_db.cpp | 8 ++++++++
 src/api/loot_db.h   | 6 ++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/api/api.cpp b/src/api/api.cpp
index 06286cb7..223d5257 100644
--- a/src/api/api.cpp
+++ b/src/api/api.cpp
@@ -265,9 +265,9 @@ LOOT_API unsigned int loot_load_lists(loot_db * const db, const char * const mas
     db->clearArrays();
 
     db->GetMasterlist() = temp;
-    db->rawMetadata = temp;
+    db->getUnevaluatedMasterlist() = temp;
     db->GetUserlist() = userTemp;
-    db->rawUserMetadata = userTemp;
+    db->getUnevaluatedUserlist() = userTemp;
 
     return loot_ok;
 }
@@ -296,8 +296,8 @@ LOOT_API unsigned int loot_eval_lists(loot_db * const db, const unsigned int lan
     // Clear caches before evaluating conditions.
     db->ClearCachedConditions();
 
-    loot::Masterlist temp = db->rawMetadata;
-    loot::MetadataList userTemp = db->rawUserMetadata;
+    loot::Masterlist temp = db->getUnevaluatedMasterlist();
+    loot::MetadataList userTemp = db->getUnevaluatedUserlist();
     try {
         // Refresh active plugins before evaluating conditions.
         temp.EvalAllConditions(*db, language);
diff --git a/src/api/loot_db.cpp b/src/api/loot_db.cpp
index 360c0708..d7e0ed55 100644
--- a/src/api/loot_db.cpp
+++ b/src/api/loot_db.cpp
@@ -32,6 +32,14 @@ loot_db::loot_db(const unsigned int clientGame, const std::string& gamePath, con
     this->Init(false, gameLocalDataPath);
 }
 
+loot::Masterlist& loot_db::getUnevaluatedMasterlist() {
+    return unevaluatedMasterlist_;
+}
+
+loot::MetadataList& loot_db::getUnevaluatedUserlist() {
+    return unevaluatedUserlist_;
+}
+
 const char * loot_db::getRevisionIdString() const {
     return revisionId.c_str();
 }
diff --git a/src/api/loot_db.h b/src/api/loot_db.h
index fc7edff3..52a9d675 100644
--- a/src/api/loot_db.h
+++ b/src/api/loot_db.h
@@ -36,6 +36,9 @@ struct loot_db : public loot::Game {
             const std::string& gamePath,
             const boost::filesystem::path& gameLocalDataPath);
 
+    loot::Masterlist& getUnevaluatedMasterlist();
+    loot::MetadataList& getUnevaluatedUserlist();
+
     loot::MetadataList rawUserMetadata;
     loot::Masterlist rawMetadata;
 
@@ -86,6 +89,9 @@ struct loot_db : public loot::Game {
     void clearBashTagMap();
     void clearArrays();
 private:
+    loot::Masterlist unevaluatedMasterlist_;
+    loot::MetadataList unevaluatedUserlist_;
+
     std::string revisionId;
     std::string revisionDate;