summaryrefslogtreecommitdiff
path: root/src/modinfowithconflictinfo.h
diff options
context:
space:
mode:
authorAl <26797547+Al12rs@users.noreply.github.com>2020-05-23 14:19:54 -0700
committerGitHub <noreply@github.com>2020-05-23 14:19:54 -0700
commit08ae9db2fd2a07acb2433275fc84c2ca47267a92 (patch)
tree5e1232028486d097352aca55ac994cd4e238064f /src/modinfowithconflictinfo.h
parente618afa5d1ef53e62d022f3d233c86e13fd4a215 (diff)
parent6374845a28c8f1f65a05fb954b4df1ebd541344b (diff)
Merge pull request #1076 from Holt59/moddatachecker
Use the ModDataChecker feature to check mod validity
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;