}
-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);