Removed source groups as they didn't find their use in the end

6 files changed, 19 insertions, 35 deletions

diff --git a/StarsEx/DataLoader.cpp b/StarsEx/DataLoader.cpp
index ac230db..677445f 100644
--- a/StarsEx/DataLoader.cpp
+++ b/StarsEx/DataLoader.cpp
@@ -97,7 +97,7 @@ DataLoader::EnableMedia(bool enable)
 // +--------------------------------------------------------------------+
 
 int
-DataLoader::MountDatafile(const char* name, Group group, int pos)
+DataLoader::MountDatafile(const char* name, int pos)
 {
     FILE* f = fopen(name, "rb");
     if (!f) {
@@ -111,7 +111,7 @@ DataLoader::MountDatafile(const char* name, Group group, int pos)
         if (archive) delete archive;
         return FAILED;
     }
-    DataSource* source = new ArchiveDataSource(archive, group);
+    DataSource* source = new ArchiveDataSource(archive);
     if (pos < 0)
         sources.append(source);
     else
diff --git a/StarsEx/DataLoader.h b/StarsEx/DataLoader.h
index a518a67..3d6f571 100644
--- a/StarsEx/DataLoader.h
+++ b/StarsEx/DataLoader.h
@@ -26,8 +26,6 @@ class Sound;
 class DataLoader
 {
 public:
-    using Group = DataSource::Group;
-
     static constexpr int FAILED {-1};
     static const char* TYPENAME() { return "DataLoader"; }
 
@@ -44,7 +42,7 @@ public:
     void        UseFileSystem(bool use=true);
     void        EnableMedia(bool enable=true);
 
-    int         MountDatafile(const char* name, Group group=Group::DEFAULT, int pos=-1);
+    int         MountDatafile(const char* name, int pos=-1);
     int         UnmountSource(int src);
 
     void        SetDataPath(const char* path);
diff --git a/StarsEx/DataSource.cpp b/StarsEx/DataSource.cpp
index b413d82..3ace2ca 100644
--- a/StarsEx/DataSource.cpp
+++ b/StarsEx/DataSource.cpp
@@ -16,14 +16,11 @@
 #include "Text.h"
 #include "Utils.h"
 
-using Group = DataSource::Group;
-
 
 int DataSource::s_next_id {0};
 
 
-DataSource::DataSource(Group group) :
-    m_group {group},
+DataSource::DataSource() :
     m_id {s_next_id++}
 {
 }
@@ -41,21 +38,14 @@ DataSource::Id() const
 }
 
 
-Group
-DataSource::GetGroup() const
-{
-    return m_group;
-}
-
-
-ArchiveDataSource::ArchiveDataSource(const char* name, Group group) :
-    ArchiveDataSource(new DataArchive(name), group)
+ArchiveDataSource::ArchiveDataSource(const char* name) :
+    ArchiveDataSource(new DataArchive(name))
 {
 }
 
 
-ArchiveDataSource::ArchiveDataSource(DataArchive* archive, Group group) :
-    DataSource(group),
+ArchiveDataSource::ArchiveDataSource(DataArchive* archive) :
+    DataSource(),
     m_archive {archive}
 {
 }
@@ -106,8 +96,8 @@ ArchiveDataSource::Load(const Text& prefix, const char* name, std::uint8_t*& buf
 }
 
 
-FileSystemDataSource::FileSystemDataSource(const char* path, Group group) :
-    DataSource(group),
+FileSystemDataSource::FileSystemDataSource(const char* path) :
+    DataSource(),
     m_path {path}
 {
 }
diff --git a/StarsEx/DataSource.h b/StarsEx/DataSource.h
index 86a496f..e945dff 100644
--- a/StarsEx/DataSource.h
+++ b/StarsEx/DataSource.h
@@ -19,20 +19,16 @@ class DataSource
 public:
     static const char* TYPENAME() { return "DataSource"; }
 
-    enum class Group { DEFAULT, BASE, MOD };
-
-    explicit DataSource(Group group=Group::DEFAULT);
+    DataSource();
     virtual ~DataSource();
 
     int Id() const;
-    Group GetGroup() const;
 
     virtual bool Find(const Text& prefix, const char* name) const = 0;
     virtual int ListFiles(const Text& prefix, Text filter, List<Text>& items, bool recurse=false) const = 0;
     virtual int Load(const Text& prefix, const char* name, std::uint8_t*& buf, bool null_terminate=false) const = 0;
 
 protected:
-    Group m_group;
     const int m_id;
     static int s_next_id;
 };
@@ -41,8 +37,8 @@ protected:
 class ArchiveDataSource : public DataSource
 {
 public:
-    explicit ArchiveDataSource(const char* name, Group group=Group::DEFAULT);
-    explicit ArchiveDataSource(DataArchive* archive, Group group=Group::DEFAULT);
+    explicit ArchiveDataSource(const char* name);
+    explicit ArchiveDataSource(DataArchive* archive);
     ~ArchiveDataSource() override;
 
     bool Find(const Text& prefix, const char* name) const override;
@@ -57,7 +53,7 @@ protected:
 class FileSystemDataSource : public DataSource
 {
 public:
-    explicit FileSystemDataSource(const char* path=".", Group group=Group::DEFAULT);
+    explicit FileSystemDataSource(const char* path=".");
     ~FileSystemDataSource() override;
 
     bool Find(const Text& prefix, const char* name) const override;
diff --git a/StarsEx/ModInfo.cpp b/StarsEx/ModInfo.cpp
index 07e6466..271517c 100644
--- a/StarsEx/ModInfo.cpp
+++ b/StarsEx/ModInfo.cpp
@@ -257,7 +257,7 @@ ModInfo::Enable()
     DataLoader* loader = DataLoader::GetLoader();
 
     if (loader && !enabled) {
-        source = loader->MountDatafile(filename, DataLoader::Group::MOD);
+        source = loader->MountDatafile(filename);
         enabled = true;
 
         if (catalog)
diff --git a/StarsEx/Starshatter.cpp b/StarsEx/Starshatter.cpp
index 129efa9..f53638d 100644
--- a/StarsEx/Starshatter.cpp
+++ b/StarsEx/Starshatter.cpp
@@ -169,7 +169,7 @@ chat_mode(0), exit_time(1.2), cutscene(0)
     DataLoader::Initialize();
 
     loader       = DataLoader::GetLoader();
-    int loadstat = loader->MountDatafile("shatter.dat", DataLoader::Group::BASE);
+    int loadstat = loader->MountDatafile("shatter.dat");
 
     if (loadstat == DataLoader::FAILED) {
         ::MessageBox(hwnd, loader->LastError(), "Starshatter - Error", MB_OK);
@@ -178,13 +178,13 @@ chat_mode(0), exit_time(1.2), cutscene(0)
     }
 
     if (loader->FindFile("vox.dat"))
-    loader->MountDatafile("vox.dat", DataLoader::Group::BASE);
+    loader->MountDatafile("vox.dat");
 
     if (loader->FindFile("start.dat"))
-    loader->MountDatafile("start.dat", DataLoader::Group::BASE);
+    loader->MountDatafile("start.dat");
 
     if (loader->FindFile("content.dat"))
-    loader->MountDatafile("content.dat", DataLoader::Group::BASE);
+    loader->MountDatafile("content.dat");
 
     LoadVideoConfig("video.cfg");