- 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)
+{
+ Pack *pack = 0;
+ for(list<Pack>::iterator i=packs.begin(); (!pack && i!=packs.end()); ++i)
+ if(i->get_filename()==fn)
+ pack = &*i;
+ if(!pack)
+ {
+ packs.push_back(Pack(fn));
+ pack = &packs.back();
+ DataFile::load(*pack, fn);
+ }
+
+ FileMap pack_files;
+ pack->collect_files(pack_files, filter);
+ files.insert(pack_files.begin(), pack_files.end());
+ for(FileMap::const_iterator i=pack_files.begin(); i!=pack_files.end(); ++i)
+ i->second->collect_objects(objects);
+}