X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Fscene.h;h=6fb45d6102b9fc422f71ba360da33b2e5a87c926;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hp=b68953446d72df4c735440a9700f827b29191a79;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git

diff --git a/source/render/scene.h b/source/render/scene.h
index b6895344..6fb45d61 100644
--- a/source/render/scene.h
+++ b/source/render/scene.h
@@ -28,10 +28,10 @@ protected:
 		unsigned inst_counter;
 
 	public:
-		Loader(Scene &, Collection &);
-		Loader(Scene &, Collection &, ContentMap &);
+		Loader(Scene &s, Collection &c): Loader(s, c, 0) { }
+		Loader(Scene &s, Collection &c, ContentMap &m) : Loader(s, c, &m) { }
 	private:
-		void init();
+		Loader(Scene &, Collection &, ContentMap *);
 
 		void object(const std::string &);
 		void object_tagged(const std::string &, const std::string &);
@@ -58,7 +58,7 @@ public:
 		GenericLoader(DataFile::Collection &);
 		~GenericLoader();
 
-		Scene *get_scene() { Scene *s = scene; scene = 0; return s; }
+		Scene *get_object() { Scene *s = scene; scene = 0; return s; }
 	private:
 		virtual void init_actions();