From 8d6c715672023577dca5a6528ff49081dede1052 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Wed, 11 Apr 2018 17:46:59 -0500
Subject: Initial archive conflict parsing

Squashed commit:
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Should fix conflict detection for archive files
---
 src/modlist.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/modlist.h')

diff --git a/src/modlist.h b/src/modlist.h
index 42269386..5841b9f2 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -112,6 +112,10 @@ 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 setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);
+
   bool modInfoAboutToChange(ModInfo::Ptr info);
   void modInfoChanged(ModInfo::Ptr info);
 
@@ -331,6 +335,8 @@ 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;
 
   TModInfoChange m_ChangeInfo;
 
-- 
cgit v1.3.1