Merge remote-tracking branch 'remotes/origin/archive_conflicts_2' into Develop

1 files changed, 7 insertions, 0 deletions

diff --git a/src/modlist.h b/src/modlist.h
index 443d583b..402d662f 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -112,6 +112,9 @@ public:
   void setOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

   void setPluginContainer(PluginContainer *pluginContainer);

 

+  void setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

+  void setArchiveLooseOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);

+

   bool modInfoAboutToChange(ModInfo::Ptr info);

   void modInfoChanged(ModInfo::Ptr info);

 

@@ -340,6 +343,10 @@ private:
 

   std::set<unsigned int> m_Overwrite;

   std::set<unsigned int> m_Overwritten;

+  std::set<unsigned int> m_ArchiveOverwrite;

+  std::set<unsigned int> m_ArchiveOverwritten;

+  std::set<unsigned int> m_ArchiveLooseOverwrite;

+  std::set<unsigned int> m_ArchiveLooseOverwritten;

 

   TModInfoChange m_ChangeInfo;