Allow embedded textures in resource datafiles

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 2cfe022c1a1d74d5035aa855922dcc7ba9e5f0c8..01426a20ced22d8911c587ab21338201c8d02c1d 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -18,6 +18,7 @@ Resources::Resources():
        default_font(0)
 {
        add_keyword<Graphic>("graphic");
+       add_keyword<GL::Texture2D>("texture");
 
        add_creator(&Resources::create_font);
        add_creator(&Resources::create_texture);
@@ -71,7 +72,7 @@ void Resources::Loader::default_font(const string &name)
 void Resources::Loader::font(const string &name)
 {
        RefPtr<GL::Font> fnt=new GL::Font;
-       load_sub(*fnt);
+       load_sub(*fnt, res);
        res.add(name, fnt.get());
        if(!res.default_font)
                res.default_font=fnt.get();