Derive Resources from DataFile::Collection

[libs/gltk.git] / source / part.cpp

diff --git a/source/part.cpp b/source/part.cpp
index 45449932618ec8a692b9b7cd5f20e275e0ad285d..1d965385e1372d2b3da5e765fac3e26351d4dc8c 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -7,8 +7,7 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Part::Part(const Resources &r, const string &n):
-       res(r),
+Part::Part(const string &n):
        name(n),
        width(1),
        height(1),
@@ -36,8 +35,9 @@ void Part::render(const Geometry &geom, State state) const
 }
 
 
-Part::Loader::Loader(Part &p):
-       part(p)
+Part::Loader::Loader(Part &p, Resources &r):
+       part(p),
+       res(r)
 {
        add("graphic", &Loader::graphic);
        add("align",   &Loader::align);
@@ -61,7 +61,7 @@ Part::Loader::~Loader()
 
 void Part::Loader::graphic(State s, const string &n)
 {
-       part.graphic[s]=&part.res.get_graphic(n);
+       part.graphic[s]=&res.get<Graphic>(n);
 }
 
 void Part::Loader::align(int x, int y)