X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fcollection.h;h=50905ce0d14972d65b24ac37dc74cdd6b5e21be9;hp=a7ac59bc8069b19697fab896826ef499b3a84e8d;hb=41230218ca007b56932fd34b79b6f3e3e70764f6;hpb=8b7cadfa3b5a72ecf466c589e1c8328d8500b588

diff --git a/source/collection.h b/source/collection.h
index a7ac59b..50905ce 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -255,6 +255,9 @@ private:
 	template<typename T>
 	CollectionItemTypeBase *get_type() const;
 
+	/// Gets a descriptor with the same type as another descriptor.
+	CollectionItemTypeBase *get_type(const CollectionItemTypeBase &) const;
+
 	/// Returns the descriptor for an item, or null if it's of an unknown type.
 	CollectionItemTypeBase *get_type_for_item(const Variant &) const;
 
@@ -263,10 +266,14 @@ protected:
 	in the order they are added. */
 	void add_source(CollectionSource &);
 
+public:
 	/** Opens a raw resource, without interpreting it as object data.  Null is
 	returned if no such file is found.  The caller must dispose of the returned
 	object when done with it. */
-	IO::Seekable *open_from_sources(const std::string &);
+	IO::Seekable *open_raw(const std::string &) const;
+
+protected:
+	IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
 
 private:
 	void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;
@@ -376,7 +383,7 @@ private:
 		Creator(FuncPtr f): func(f) { }
 
 		virtual T *create(Collection &coll, const std::string &name) const
-		{ return (static_cast<C &>(coll).*func)(name); }
+		{ return (dynamic_cast<C &>(coll).*func)(name); }
 	};
 
 	template<typename B>