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

1 files changed, 25 insertions, 1 deletions

diff --git a/src/modinfo.h b/src/modinfo.h
index b6d7209c..6b7c714e 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -72,6 +72,11 @@ public:
     FLAG_CONFLICT_OVERWRITTEN,

     FLAG_CONFLICT_MIXED,

     FLAG_CONFLICT_REDUNDANT,

+    FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE,

+    FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,

+    FLAG_ARCHIVE_CONFLICT_OVERWRITE,

+    FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,

+    FLAG_ARCHIVE_CONFLICT_MIXED,

     FLAG_PLUGIN_SELECTED,

     FLAG_ALTERNATE_GAME

   };

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

     CONTENT_INI,

     CONTENT_MODGROUP

-

   };

 

   static const int NUM_CONTENT_TYPES = CONTENT_MODGROUP + 1;

@@ -626,6 +630,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 thos mod's loose files. Updates may be delayed

+  */

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

+

+  /**

+  * @return list of mods (as mod index) with loose files that overwrite this one's archive files. Updates may be delayed

+  */

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

+

+  /**

    * @brief update conflict information

    */

   virtual void doConflictCheck() const {}