Make all loot_db member variables private

This commit is contained in:
Oliver Hamlet
2016-07-13 20:47:22 +01:00
parent 58734a7089
commit 95937596da
3 changed files with 18 additions and 4 deletions
+4 -4
View File
@@ -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);
+8
View File
@@ -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();
}
+6
View File
@@ -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;