Add version of add_pack_io with filter

diff --git a/source/packsource.cpp b/source/packsource.cpp
index 938a627c05fb9b3685cb25cb53678439e39697f7..fe9e67db6eabae37ae1b38278d68104b305f2739 100644 (file)
--- a/source/packsource.cpp
+++ b/source/packsource.cpp
@@ -33,11 +33,16 @@ void PackSource::add_pack_io(IO::Seekable &io, const string &fn)
        add_pack(&io, fn, string());
 }
 
+void PackSource::add_pack_io(IO::Seekable &io, const string &fn, const string &filter)
+{
+       add_pack(&io, fn, filter);
+}
+
 void PackSource::add_pack(IO::Seekable *io, const string &fn, const string &filter)
 {
        Pack *pack = 0;
        for(list<Pack>::iterator i=packs.begin(); (!pack && i!=packs.end()); ++i)
-               if(i->get_filename()==fn)
+               if(i->get_filename()==fn || (io && i->get_io()==io))
                        pack = &*i;
        if(!pack)
        {

diff --git a/source/packsource.h b/source/packsource.h
index 440b45118bd66fc2af1c1d0c7b2f0a195a237fd9..7d616614cff490690d73699f4a5b4f6a76a545f1 100644 (file)
--- a/source/packsource.h
+++ b/source/packsource.h
@@ -130,6 +130,10 @@ public:
        PackSource. */
        void add_pack_io(IO::Seekable &, const std::string & = std::string());
 
+       /** Adds a pack from an I/O object with a regex to filter logical files.
+       Multiple filters for the same I/O object can be added with repeated calls. */
+       void add_pack_io(IO::Seekable &, const std::string &, const std::string &);
+
 private:
        void add_pack(IO::Seekable *, const std::string &, const std::string &);