- packs.push_back(Pack(fn));
- Pack &pack = packs.back();
- DataFile::load(pack, fn);
+ add_pack_file(fn, string());
+}
+
+void PackSource::add_pack_file(const string &fn, const string &filter)
+{
+ add_pack(0, fn, filter);
+}
+
+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 || (io && i->get_io()==io))
+ pack = &*i;
+ if(!pack)
+ {
+ packs.push_back(Pack(io, fn));
+ pack = &packs.back();
+ if(io)
+ {
+ DataFile::Parser parser(*io, fn);
+ Pack::Loader loader(*pack);
+ loader.load(parser);
+ }
+ else
+ DataFile::load(*pack, fn);
+ }