From 5fc66d879391135878e06ee25a32526b9d5c59d9 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Fri, 22 May 2020 15:27:19 +0200
Subject: Move m_GamePlugin up into ModInfoWithConflictInfo.

---
 src/modinfowithconflictinfo.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/modinfowithconflictinfo.h')

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 0bb7c422..94a61c62 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -10,8 +10,6 @@ class ModInfoWithConflictInfo : public ModInfo
 
 public:
 
-  ModInfoWithConflictInfo(PluginContainer *pluginContainer, MOShared::DirectoryEntry **directoryStructure);
-
   std::vector<ModInfo::EConflictFlag> getConflictFlags() const override;
   virtual std::vector<ModInfo::EFlag> getFlags() const override;
 
@@ -43,6 +41,11 @@ protected:
    **/
   virtual bool doTestValid() const;
 
+  ModInfoWithConflictInfo(
+    PluginContainer* pluginContainer,
+    const MOBase::IPluginGame* gamePlugin,
+    MOShared::DirectoryEntry** directoryStructure);
+
 private:
 
   enum EConflictType {
@@ -80,6 +83,9 @@ private:
 
 private:
 
+  // Current game plugin running in MO2:
+  MOBase::IPluginGame const* m_GamePlugin;
+
   MOShared::DirectoryEntry **m_DirectoryStructure;
 
   mutable EConflictType m_CurrentConflictState;
-- 
cgit v1.3.1