X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Fscene.cpp;h=229588679af54726cb3a203ed3d8b21a1e4330c9;hb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed;hp=3c101b8a172cdba1fc421eecc5a182946bb3f308;hpb=f8bf444f26ce0bb392b96317ef3665be0af110aa;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 3c101b8a..22958867 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/fs/utils.h>
+#include <msp/strings/format.h>
 #include "camera.h"
 #include "objectinstance.h"
 #include "occludedscene.h"
@@ -88,24 +89,11 @@ Scene::SceneRegistry &Scene::get_scene_registry()
 }
 
 
-Scene::Loader::Loader(Scene &s, Collection &c):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
 	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(0)
+	content(m),
+	inst_counter(0)
 {
-	init();
-}
-
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
-	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(&m)
-{
-	init();
-}
-
-void Scene::Loader::init()
-{
-	inst_counter = 0;
-
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
 	add("scene", &Loader::scene);