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

1 files changed, 23 insertions, 1 deletions

diff --git a/src/modinfo.h b/src/modinfo.h
index 5a69185d..15876a23 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -72,6 +72,9 @@ public:
     FLAG_CONFLICT_OVERWRITTEN,

     FLAG_CONFLICT_MIXED,

     FLAG_CONFLICT_REDUNDANT,

+    FLAG_ARCHIVE_CONFLICT_OVERWRITE,

+    FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,

+    FLAG_ARCHIVE_CONFLICT_MIXED,

     FLAG_PLUGIN_SELECTED,

     FLAG_ALTERNATE_GAME

   };

@@ -90,7 +93,6 @@ public:
     CONTENT_MCM,

     CONTENT_INI,

     CONTENT_MODGROUP

-

   };

 

   static const int NUM_CONTENT_TYPES = CONTENT_MODGROUP + 1;

@@ -626,6 +628,26 @@ public:
   virtual std::set<unsigned int> getModOverwritten() { return std::set<unsigned int>(); }

 

   /**

+   * @return retrieve list of mods (as mod index) with archives that are overwritten by this one. Updates may be delayed

+  */

+  virtual std::set<unsigned int> getModArchiveOverwrite() { return std::set<unsigned int>(); }

+

+  /**

+  * @return list of mods (as mod index) with archives that overwrite this one. Updates may be delayed

+  */

+  virtual std::set<unsigned int> getModArchiveOverwritten() { return std::set<unsigned int>(); }

+

+  /**

+   * @return retrieve list of mods (as mod index) with archives that are overwritten by this one. Updates may be delayed

+  */

+  virtual std::set<unsigned int> getModArchiveOverwrite() { return std::set<unsigned int>(); }

+

+  /**

+  * @return list of mods (as mod index) with archives that overwrite this one. Updates may be delayed

+  */

+  virtual std::set<unsigned int> getModArchiveOverwritten() { return std::set<unsigned int>(); }

+

+  /**

    * @brief update conflict information

    */

   virtual void doConflictCheck() const {}