summaryrefslogtreecommitdiff
path: root/src/modinfowithconflictinfo.h
diff options
context:
space:
mode:
authorMikaël Capelle <capelle.mikael@gmail.com>2020-05-22 15:27:19 +0200
committerMikaël Capelle <capelle.mikael@gmail.com>2020-05-22 15:27:19 +0200
commit5fc66d879391135878e06ee25a32526b9d5c59d9 (patch)
tree4953a926d036f0b908f1d47851b8b9878cb93d31 /src/modinfowithconflictinfo.h
parentc0035ada020fe90085c698c0829f771c8d542031 (diff)
Move m_GamePlugin up into ModInfoWithConflictInfo.
Diffstat (limited to 'src/modinfowithconflictinfo.h')
-rw-r--r--src/modinfowithconflictinfo.h10
1 files changed, 8 insertions, 2 deletions
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;