X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fcollection.h;h=06b8e348cbe3d2a7e16ce2735971802efa73a863;hp=0d2dc6be2fd7a6c4043ff4db18bfdc32a04bb270;hb=43b8dee0bf05dee1b4a07cc001fae0c81ec53a2f;hpb=9b1656018f783eb4aad2fbdc1de1404691e89bb1

diff --git a/source/collection.h b/source/collection.h
index 0d2dc6b..06b8e34 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -17,17 +17,14 @@ namespace DataFile {
 Helper struct to determine whether a Loader has a Collection typedef.
 */
 template<typename T>
-struct NeedsCollection
+struct NeedsCollection: public Sfinae
 {
-	struct Yes { char c[2]; };
-	struct No { char c; };
-
 	template<typename U>
 	static Yes f(typename U::Collection *);
 	template<typename U>
 	static No f(...);
 
-	enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+	enum { value = Evaluate<sizeof(f<T>(0))>::value };
 };
 
 class CollectionItemTypeBase;
@@ -46,8 +43,8 @@ method for details.
 Collections can have sources for loading objects on demand.  Automatic loading
 only works on a non-const Collection.  See class CollectionSource for details.
 
-A fallback collection can be designated as another way of loading items that
-are not present.  Items retrieted from the fallback collection are shared
+As a last resort, a fallback collection can be designated for loading items
+that are not present.  Items retrieted from the fallback collection are shared
 between the collections, and are only deleted when all collections in the chain
 have been destroyed.
 */
@@ -86,7 +83,7 @@ public:
 private:
 	typedef std::map<std::string, Variant> ItemMap;
 	typedef std::list<CollectionItemTypeBase *> TypeList;
-	typedef std::list<CollectionSource *> SourceList;
+	typedef std::list<const CollectionSource *> SourceList;
 
 	TypeList types;
 	ItemMap items;
@@ -258,13 +255,25 @@ 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;
 
 protected:
-	void add_source(CollectionSource &);
+	/** Adds a source for automatically loading items.  Sources are consulted
+	in the order they are added. */
+	void add_source(const 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_raw(const std::string &) const;
 
-	IO::Seekable *open_from_sources(const std::string &);
+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;
@@ -275,6 +284,8 @@ protected:
 	/** Sets a fallback collection, which will be consulted if an item is not
 	found. */
 	void set_fallback(Collection *);
+
+	Collection *get_fallback() const { return fallback; }
 };
 
 template<typename T>
@@ -374,7 +385,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>