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)
{
return;
File &file = i->second->get_file();
- if(file.is_loaded())
- return;
- file.set_loaded();
RefPtr<IO::Base> in = file.open();
Parser parser(*in, file.get_full_name());
filename(fn),
offset(0),
length(0),
- collection(false),
- loaded(false)
+ collection(false)
{ }
RefPtr<IO::Seekable> PackSource::File::open() const
return format("%s/%s", pack.get_filename(), filename);
}
-void PackSource::File::set_loaded()
-{
- loaded = true;
-}
-
void PackSource::File::collect_objects(ObjectMap &objs) const
{
for(list<Object>::const_iterator i=objects.begin(); i!=objects.end(); ++i)