Fixes bugs regarding game features.

Holt59 · Jun 1, 2024 · 6915910 · 6915910
1 parent f913cac
commit 6915910
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/game_features.cpp b/src/game_features.cpp
@@ -28,24 +28,24 @@ const std::type_index ModDataContentIndex{typeid(ModDataContent)};
 
 class GameFeatures::CombinedModDataChecker : public ModDataChecker
 {
-  std::vector<std::shared_ptr<ModDataChecker>> m_checkers;
+  std::vector<std::shared_ptr<ModDataChecker>> m_modDataCheckers;
   mutable std::shared_ptr<ModDataChecker> m_fixer = nullptr;
 
 public:
   void setCheckers(std::vector<std::shared_ptr<ModDataChecker>> checkers)
   {
-    m_checkers = std::move(checkers);
-    m_fixer    = nullptr;
+    m_modDataCheckers = std::move(checkers);
+    m_fixer           = nullptr;
   }
 
-  bool isValid() const { return m_checkers.empty(); }
+  bool isValid() const { return !m_modDataCheckers.empty(); }
 
   CheckReturn
   dataLooksValid(std::shared_ptr<const MOBase::IFileTree> fileTree) const override
   {
     m_fixer = nullptr;
 
-    for (auto& modDataChecker : m_checkers) {
+    for (auto& modDataChecker : m_modDataCheckers) {
       auto check = modDataChecker->dataLooksValid(fileTree);
 
       switch (check) {
@@ -78,6 +78,8 @@ class GameFeatures::CombinedModDataContent : public ModDataContent
   std::vector<Content> m_allContents;
 
 public:
+  bool isValid() const { return !m_modDataContents.empty(); }
+
   void setContents(std::vector<std::shared_ptr<ModDataContent>> modDataContents)
   {
     m_modDataContents.clear();
@@ -103,8 +105,6 @@ class GameFeatures::CombinedModDataContent : public ModDataContent
     }
   }
 
-  bool isValid() const { return !m_modDataContents.empty(); }
-
   std::vector<Content> getAllContents() const override { return m_allContents; }
 
   std::vector<int>

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
@@ -27,8 +27,8 @@ OrganizerProxy::OrganizerProxy(OrganizerCore* organizer,
       m_ModListProxy(std::make_unique<ModListProxy>(this, organizer->modList())),
       m_PluginListProxy(
           std::make_unique<PluginListProxy>(this, organizer->pluginList())),
-      m_GameFeaturesProxy(std::make_unique<GameFeaturesProxy>(
-          this, organizer->pluginContainer().gameFeatures()))
+      m_GameFeaturesProxy(
+          std::make_unique<GameFeaturesProxy>(this, pluginContainer->gameFeatures()))
 {}
 
 OrganizerProxy::~OrganizerProxy()