Switched to use new Sources everywhere applicable in the Loader

1 files changed, 1 insertions, 6 deletions

diff --git a/StarsEx/DataLoader.h b/StarsEx/DataLoader.h
index 820224a..a518a67 100644
--- a/StarsEx/DataLoader.h
+++ b/StarsEx/DataLoader.h
@@ -47,9 +47,6 @@ public:
     int         MountDatafile(const char* name, Group group=Group::DEFAULT, int pos=-1);
     int         UnmountSource(int src);
 
-    int         EnableDatafile(const char* name);
-    int         DisableDatafile(const char* name);
-
     void        SetDataPath(const char* path);
     const char* GetDataPath() const { return datapath; }
 
@@ -58,7 +55,7 @@ public:
 
     bool  FindFile(const char* fname);
     int   ListFiles(const char* filter, List<Text>& list, bool recurse=false);
-    int   ListArchiveFiles(const char* archive, const char* filter, List<Text>& list);
+    int   ListArchiveFiles(int src, const char* filter, List<Text>& list);
     int   LoadBuffer(const char* name, BYTE*&  buf, bool null_terminate=false, bool optional=false);
     int   LoadBitmap(const char* name, Bitmap& bmp, int type=0, bool optional=false);
     int   CacheBitmap(const char* name, Bitmap*& bmp, int type=0, bool optional=false);
@@ -74,7 +71,6 @@ private:
     int   LoadHiColor(const char* name, Bitmap& bmp, int type);
     int   LoadAlpha(  const char* name, Bitmap& bmp, int type);
 
-    void  ListFileSystem(const char* filter, List<Text>& list, Text base_path, bool recurse);
     int   LoadPartialFile(const char* fname, BYTE*& buf, int max_load, bool optional=false);
     int   LoadOggStream(const char* fname, Sound*& snd);
 
@@ -83,7 +79,6 @@ private:
 
     Text last_error;
 
-    List<DataArchive> archives;
     List<DataSource> sources;
     DataSource* work_directory_source;
     static DataLoader* loader;